diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24ec192c..492d70f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea https://github.com/dotnet/arcade-services diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 03a99606..fd1d080e 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -111,12 +111,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 2>/dev/null; then + LDFLAGS="-fuse-ld=lld" fi fi diff --git a/global.json b/global.json index 2ca97847..cbf32aa4 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2" } }