@@ -922,14 +922,14 @@ function Build-Compilers() {
922
922
Build-CMakeProject `
923
923
- Src $SourceCache \llvm- project\llvm `
924
924
- Bin $BinaryCache \1 `
925
+ - InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
925
926
- Arch $Arch `
926
927
- UseMSVCCompilers C, CXX `
927
928
- BuildTargets $Targets `
928
929
- CacheScript $SourceCache \swift\cmake\caches\Windows- $ ($Arch.LLVMName ).cmake `
929
930
- Defines ($TestingDefines + @ {
930
931
CLANG_TABLEGEN = " $BinaryCache \0\bin\clang-tblgen.exe" ;
931
932
CLANG_TIDY_CONFUSABLE_CHARS_GEN = " $BinaryCache \0\bin\clang-tidy-confusable-chars-gen.exe" ;
932
- CMAKE_INSTALL_PREFIX = " $ ( $Arch.ToolchainInstallRoot ) \usr" ;
933
933
CMAKE_Swift_COMPILER = (Join-Path - Path (Get-PinnedToolchainTool ) - ChildPath " swiftc.exe" );
934
934
CMAKE_Swift_FLAGS = @ (" -sdk" , (Get-PinnedToolchainSDK ));
935
935
LLDB_PYTHON_EXE_RELATIVE_PATH = " python.exe" ;
@@ -1174,11 +1174,11 @@ function Build-Dispatch($Arch, [switch]$Test = $false) {
1174
1174
Build-CMakeProject `
1175
1175
- Src $SourceCache \swift- corelibs- libdispatch `
1176
1176
- Bin (Get-ProjectBinaryCache $Arch 2 ) `
1177
+ - InstallTo " $ ( $Arch.SDKInstallRoot ) \usr" `
1177
1178
- Arch $Arch `
1178
1179
- UseBuiltCompilers C, CXX, Swift `
1179
1180
- BuildTargets $Targets `
1180
1181
- Defines @ {
1181
- CMAKE_INSTALL_PREFIX = " $ ( $Arch.SDKInstallRoot ) \usr" ;
1182
1182
CMAKE_SYSTEM_NAME = " Windows" ;
1183
1183
CMAKE_SYSTEM_PROCESSOR = $Arch.CMakeName ;
1184
1184
ENABLE_SWIFT = " YES" ;
@@ -1209,11 +1209,11 @@ function Build-Foundation($Arch, [switch]$Test = $false) {
1209
1209
Build-CMakeProject `
1210
1210
- Src $SourceCache \swift- corelibs- foundation `
1211
1211
- Bin $FoundationBinaryCache `
1212
+ - InstallTo " $ ( $Arch.SDKInstallRoot ) \usr" `
1212
1213
- Arch $Arch `
1213
1214
- UseBuiltCompilers ASM, C, Swift `
1214
1215
- BuildTargets $Targets `
1215
1216
- Defines (@ {
1216
- CMAKE_INSTALL_PREFIX = " $ ( $Arch.SDKInstallRoot ) \usr" ;
1217
1217
CMAKE_SYSTEM_NAME = " Windows" ;
1218
1218
CMAKE_SYSTEM_PROCESSOR = $Arch.CMakeName ;
1219
1219
# Turn off safeseh for lld as it has safeseh enabled by default
@@ -1261,11 +1261,11 @@ function Build-XCTest($Arch, [switch]$Test = $false) {
1261
1261
Build-CMakeProject `
1262
1262
- Src $SourceCache \swift- corelibs- xctest `
1263
1263
- Bin $XCTestBinaryCache `
1264
+ - InstallTo " $ ( $Arch.XCTestInstallRoot ) \usr" `
1264
1265
- Arch $Arch `
1265
1266
- UseBuiltCompilers Swift `
1266
1267
- BuildTargets $Targets `
1267
1268
- Defines (@ {
1268
- CMAKE_INSTALL_PREFIX = " $ ( $Arch.XCTestInstallRoot ) \usr" ;
1269
1269
CMAKE_SYSTEM_NAME = " Windows" ;
1270
1270
CMAKE_SYSTEM_PROCESSOR = $Arch.CMakeName ;
1271
1271
dispatch_DIR = " $DispatchBinaryCache \cmake\modules" ;
@@ -1432,13 +1432,13 @@ function Build-LLBuild($Arch, [switch]$Test = $false) {
1432
1432
Build-CMakeProject `
1433
1433
- Src $SourceCache \llbuild `
1434
1434
- Bin $BinaryCache \4 `
1435
+ - InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1435
1436
- Arch $Arch `
1436
1437
- UseMSVCCompilers CXX `
1437
1438
- UseBuiltCompilers Swift `
1438
1439
- SwiftSDK $SDKInstallRoot `
1439
1440
- BuildTargets $Targets `
1440
1441
- Defines ($TestingDefines + @ {
1441
- CMAKE_INSTALL_PREFIX = " $ ( $Arch.ToolchainInstallRoot ) \usr" ;
1442
1442
BUILD_SHARED_LIBS = " YES" ;
1443
1443
LLBUILD_SUPPORT_BINDINGS = " Swift" ;
1444
1444
SQLite3_INCLUDE_DIR = " $LibraryRoot \sqlite-3.43.2\usr\include" ;
0 commit comments