@@ -2375,7 +2375,6 @@ function Build-Runtime([Hashtable] $Platform) {
2375
2375
- SwiftSDK $null `
2376
2376
- CacheScript $SourceCache \swift\cmake\caches\Runtime- $ ($Platform.OS.ToString ())- $ ($Platform.Architecture.LLVMName ).cmake `
2377
2377
- Defines ($PlatformDefines + @ {
2378
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2379
2378
CMAKE_Swift_COMPILER_WORKS = " YES" ;
2380
2379
CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
2381
2380
LLVM_DIR = " $ ( Get-ProjectBinaryCache $Platform LLVM) \lib\cmake\llvm" ;
@@ -2496,7 +2495,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2496
2495
- Defines @ {
2497
2496
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2498
2497
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2499
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2500
2498
# TODO(compnerd) enforce dynamic linking of BlocksRuntime and dispatch.
2501
2499
CMAKE_CXX_FLAGS = $ (if ($Static ) { @ (" -Ddispatch_STATIC" ) } else { @ () });
2502
2500
CMAKE_Swift_FLAGS = $ (if ($Static ) { @ (" -Xcc" , " -static-libclosure" ) } else { @ () });
@@ -2522,7 +2520,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2522
2520
- Defines @ {
2523
2521
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2524
2522
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2525
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2526
2523
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2527
2524
2528
2525
SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2539,7 +2536,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2539
2536
- Defines @ {
2540
2537
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2541
2538
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2542
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2543
2539
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2544
2540
2545
2541
SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2556,7 +2552,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2556
2552
- Defines @ {
2557
2553
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2558
2554
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2559
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2560
2555
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2561
2556
2562
2557
SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2574,8 +2569,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2574
2569
- Defines @ {
2575
2570
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2576
2571
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2572
+ # FIXME(#83449): avoid using `SwiftCMakeConfig.h`
2577
2573
CMAKE_CXX_FLAGS = @ (" -I${RuntimeBinaryCache} \include" );
2578
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2579
2574
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2580
2575
2581
2576
SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2593,8 +2588,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2593
2588
- Defines @ {
2594
2589
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2595
2590
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2591
+ # FIXME(#83449): avoid using `SwiftCMakeConfig.h`
2596
2592
CMAKE_CXX_FLAGS = @ (" -I${RuntimeBinaryCache} \include" );
2597
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2598
2593
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2599
2594
2600
2595
SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2611,7 +2606,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
2611
2606
- Defines @ {
2612
2607
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2613
2608
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2614
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2615
2609
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2616
2610
2617
2611
SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2958,7 +2952,6 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
2958
2952
- Defines @ {
2959
2953
BUILD_SHARED_LIBS = " NO" ;
2960
2954
CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2961
- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
2962
2955
CMAKE_Swift_FLAGS = @ (" -static-stdlib" , " -Xfrontend" , " -use-static-resource-dir" );
2963
2956
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2964
2957
0 commit comments