@@ -2468,6 +2468,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2468
2468
Invoke-IsolatingEnvVars {
2469
2469
$env: Path = " $ ( Get-CMarkBinaryCache $Platform ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
2470
2470
2471
+ $SDKRoot = Get-SwiftSDK $Platform.OS - Identifier " $ ( $Platform.OS ) Experimental"
2472
+
2471
2473
$RuntimeBinaryCache = if ($Static ) {
2472
2474
Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime
2473
2475
} else {
@@ -2513,7 +2515,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2513
2515
Build-CMakeProject `
2514
2516
- Src $SourceCache \swift\Runtimes\Core `
2515
2517
- Bin $RuntimeBinaryCache `
2516
- - InstallTo " $ ( Get-SwiftSDK $Platform .OS - Identifier " $ ( $Platform .OS ) Experimental " ) \usr" `
2518
+ - InstallTo " ${SDKROOT} \usr" `
2517
2519
- Platform $Platform `
2518
2520
- UseBuiltCompilers C, CXX, Swift `
2519
2521
- UseGNUDriver `
@@ -2541,7 +2543,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2541
2543
Build-CMakeProject `
2542
2544
- Src $SourceCache \swift\Runtimes\Overlay `
2543
2545
- Bin $OverlayBinaryCache `
2544
- - InstallTo " $ ( Get-SwiftSDK $Platform .OS - Identifier " $ ( $Platform .OS ) Experimental " ) \usr" `
2546
+ - InstallTo " ${SDKROOT} \usr" `
2545
2547
- Platform $Platform `
2546
2548
- UseBuiltCompilers C, CXX, Swift `
2547
2549
- UseGNUDriver `
@@ -2559,7 +2561,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2559
2561
Build-CMakeProject `
2560
2562
- Src $SourceCache \swift\Runtimes\Supplemental\StringProcessing `
2561
2563
- Bin $StringProcessingBinaryCache `
2562
- - InstallTo " $ ( Get-SwiftSDK $Platform .OS - Identifier " $ ( $Platform .OS ) Experimental " ) \usr" `
2564
+ - InstallTo " ${SDKROOT} \usr" `
2563
2565
- Platform $Platform `
2564
2566
- UseBuiltCompilers C, Swift `
2565
2567
- UseGNUDriver `
@@ -2577,7 +2579,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2577
2579
Build-CMakeProject `
2578
2580
- Src $SourceCache \swift\Runtimes\Supplemental\Synchronization `
2579
2581
- Bin $SynchronizationBinaryCache `
2580
- - InstallTo " $ ( Get-SwiftSDK $Platform .OS - Identifier " $ ( $Platform .OS ) Experimental " ) \usr" `
2582
+ - InstallTo " ${SDKROOT} \usr" `
2581
2583
- Platform $Platform `
2582
2584
- UseBuiltCompilers C, Swift `
2583
2585
- UseGNUDriver `
@@ -2596,7 +2598,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2596
2598
Build-CMakeProject `
2597
2599
- Src $SourceCache \swift\Runtimes\Supplemental\Distributed `
2598
2600
- Bin $DistributedBinaryCache `
2599
- - InstallTo " $ ( Get-SwiftSDK $Platform .OS - Identifier " $ ( $Platform .OS ) Experimental " ) \usr" `
2601
+ - InstallTo " ${SDKROOT} \usr" `
2600
2602
- Platform $Platform `
2601
2603
- UseBuiltCompilers C, CXX, Swift `
2602
2604
- UseGNUDriver `
@@ -2616,7 +2618,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2616
2618
Build-CMakeProject `
2617
2619
- Src $SourceCache \swift\Runtimes\Supplemental\Observation `
2618
2620
- Bin $ObservationBinaryCache `
2619
- - InstallTo " $ ( Get-SwiftSDK $Platform .OS - Identifier " $ ( $Platform .OS ) Experimental " ) \usr" `
2621
+ - InstallTo " ${SDKROOT} \usr" `
2620
2622
- Platform $Platform `
2621
2623
- UseBuiltCompilers CXX, Swift `
2622
2624
- UseGNUDriver `
@@ -2636,7 +2638,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2636
2638
Build-CMakeProject `
2637
2639
- Src $SourceCache \swift\Runtimes\Supplemental\Differentiation `
2638
2640
- Bin $DifferentiationBinaryCache `
2639
- - InstallTo " $ ( Get-SwiftSDK $Platform .OS - Identifier " $ ( $Platform .OS ) Experimental " ) \usr" `
2641
+ - InstallTo " ${SDKROOT} \usr" `
2640
2642
- Platform $Platform `
2641
2643
- UseBuiltCompilers C, CXX, Swift `
2642
2644
- UseGNUDriver `
0 commit comments