@@ -933,7 +933,7 @@ function Fetch-Dependencies {
933
933
}
934
934
}
935
935
936
- function Get-PinnedToolchainTool () {
936
+ function Get-PinnedToolchainToolsDir () {
937
937
# NOTE: add a workaround for the main snapshots that used the wrong version
938
938
# when building that was not noticed. This allows use of the nightly snapshot
939
939
# as a pinned toolchain.
@@ -1166,7 +1166,7 @@ function Build-CMakeProject {
1166
1166
if ($UseBuiltCompilers.Contains (" ASM" )) {
1167
1167
TryAdd- KeyValue $Defines CMAKE_ASM_COMPILER ([IO.Path ]::Combine($CompilersBinaryCache , " bin" , $Driver ))
1168
1168
} else {
1169
- TryAdd- KeyValue $Defines CMAKE_ASM_COMPILER (Join-Path - Path (Get-PinnedToolchainTool ) - ChildPath $Driver )
1169
+ TryAdd- KeyValue $Defines CMAKE_ASM_COMPILER (Join-Path - Path (Get-PinnedToolchainToolsDir ) - ChildPath $Driver )
1170
1170
}
1171
1171
Append- FlagsDefine $Defines CMAKE_ASM_FLAGS " --target=$ ( $Arch.LLVMTarget ) "
1172
1172
if ($Platform -eq " Windows" ) {
@@ -1178,7 +1178,7 @@ function Build-CMakeProject {
1178
1178
if ($UseBuiltCompilers.Contains (" C" )) {
1179
1179
TryAdd- KeyValue $Defines CMAKE_C_COMPILER ([IO.Path ]::Combine($CompilersBinaryCache , " bin" , $Driver ))
1180
1180
} else {
1181
- TryAdd- KeyValue $Defines CMAKE_C_COMPILER (Join-Path - Path (Get-PinnedToolchainTool ) - ChildPath $Driver )
1181
+ TryAdd- KeyValue $Defines CMAKE_C_COMPILER (Join-Path - Path (Get-PinnedToolchainToolsDir ) - ChildPath $Driver )
1182
1182
}
1183
1183
TryAdd- KeyValue $Defines CMAKE_C_COMPILER_TARGET $Arch.LLVMTarget
1184
1184
@@ -1192,7 +1192,7 @@ function Build-CMakeProject {
1192
1192
if ($UseBuiltCompilers.Contains (" CXX" )) {
1193
1193
TryAdd- KeyValue $Defines CMAKE_CXX_COMPILER ([IO.Path ]::Combine($CompilersBinaryCache , " bin" , $Driver ))
1194
1194
} else {
1195
- TryAdd- KeyValue $Defines CMAKE_CXX_COMPILER (Join-Path - Path (Get-PinnedToolchainTool ) - ChildPath $Driver )
1195
+ TryAdd- KeyValue $Defines CMAKE_CXX_COMPILER (Join-Path - Path (Get-PinnedToolchainToolsDir ) - ChildPath $Driver )
1196
1196
}
1197
1197
TryAdd- KeyValue $Defines CMAKE_CXX_COMPILER_TARGET $Arch.LLVMTarget
1198
1198
@@ -1209,7 +1209,7 @@ function Build-CMakeProject {
1209
1209
} elseif ($UseBuiltCompilers.Contains (" Swift" )) {
1210
1210
TryAdd- KeyValue $Defines CMAKE_Swift_COMPILER ([IO.Path ]::Combine($CompilersBinaryCache , " bin" , " swiftc.exe" ))
1211
1211
} else {
1212
- TryAdd- KeyValue $Defines CMAKE_Swift_COMPILER (Join-Path - Path (Get-PinnedToolchainTool ) - ChildPath " swiftc.exe" )
1212
+ TryAdd- KeyValue $Defines CMAKE_Swift_COMPILER (Join-Path - Path (Get-PinnedToolchainToolsDir ) - ChildPath " swiftc.exe" )
1213
1213
}
1214
1214
if (-not ($Platform -eq " Windows" )) {
1215
1215
TryAdd- KeyValue $Defines CMAKE_Swift_COMPILER_WORKS = " YES"
@@ -1690,7 +1690,7 @@ function Build-Compilers() {
1690
1690
Python3_LIBRARY = " $PythonRoot \libs\$PythonLibName .lib" ;
1691
1691
Python3_ROOT_DIR = $PythonRoot ;
1692
1692
SWIFT_BUILD_SWIFT_SYNTAX = " YES" ;
1693
- SWIFT_CLANG_LOCATION = (Get-PinnedToolchainTool );
1693
+ SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir );
1694
1694
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = " YES" ;
1695
1695
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = " YES" ;
1696
1696
SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = " YES" ;
0 commit comments