Skip to content

Commit ed75873

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20211126.4 (#781)
[main] Update dependencies from dotnet/arcade
1 parent e54a111 commit ed75873

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21573.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
8+
<Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21573.3">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
12+
<Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

eng/common/native/init-compiler.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
44
#
5+
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
56

67
if [[ "$#" -lt 3 ]]; then
78
echo "Usage..."
@@ -111,12 +112,10 @@ if [[ -z "$CC" ]]; then
111112
exit 1
112113
fi
113114

114-
if [[ "$compiler" == "clang" ]]; then
115-
if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then
116-
# Only lld version >= 9 can be considered stable
117-
if [[ "$majorVersion" -ge 9 ]]; then
118-
LDFLAGS="-fuse-ld=lld"
119-
fi
115+
# Only lld version >= 9 can be considered stable
116+
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
117+
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
118+
LDFLAGS="-fuse-ld=lld"
120119
fi
121120
fi
122121

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "6.0.100"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3",
7-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3"
6+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4",
7+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4"
88
}
99
}

0 commit comments

Comments
 (0)