Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20211…
Browse files Browse the repository at this point in the history
…126.4 (#781)

[main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Nov 29, 2021
1 parent e54a111 commit ed75873
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21573.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
<Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21573.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
<Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
11 changes: 5 additions & 6 deletions eng/common/native/init-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!

if [[ "$#" -lt 3 ]]; then
echo "Usage..."
Expand Down Expand Up @@ -111,12 +112,10 @@ if [[ -z "$CC" ]]; then
exit 1
fi

if [[ "$compiler" == "clang" ]]; then
if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then
# Only lld version >= 9 can be considered stable
if [[ "$majorVersion" -ge 9 ]]; then
LDFLAGS="-fuse-ld=lld"
fi
# Only lld version >= 9 can be considered stable
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
LDFLAGS="-fuse-ld=lld"
fi
fi

Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dotnet": "6.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4"
}
}

0 comments on commit ed75873

Please sign in to comment.