File tree Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Original file line number Diff line number Diff line change 3
3
<ProductDependencies >
4
4
</ProductDependencies >
5
5
<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 " >
7
7
<Uri >https://github.com/dotnet/arcade</Uri >
8
- <Sha >927f8d4d5036f68a5fc6d042f336bc9458027208 </Sha >
8
+ <Sha >427c05909067bb2e484116ae2239456bb45adb85 </Sha >
9
9
</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 " >
11
11
<Uri >https://github.com/dotnet/arcade</Uri >
12
- <Sha >927f8d4d5036f68a5fc6d042f336bc9458027208 </Sha >
12
+ <Sha >427c05909067bb2e484116ae2239456bb45adb85 </Sha >
13
13
</Dependency >
14
14
</ToolsetDependencies >
15
15
</Dependencies >
Original file line number Diff line number Diff line change 2
2
#
3
3
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
4
4
#
5
+ # NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
5
6
6
7
if [[ " $# " -lt 3 ]]; then
7
8
echo " Usage..."
@@ -111,12 +112,10 @@ if [[ -z "$CC" ]]; then
111
112
exit 1
112
113
fi
113
114
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"
120
119
fi
121
120
fi
122
121
Original file line number Diff line number Diff line change 3
3
"dotnet" : " 6.0.100"
4
4
},
5
5
"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 "
8
8
}
9
9
}
You can’t perform that action at this time.
0 commit comments