@@ -2375,7 +2375,6 @@ function Build-Runtime([Hashtable] $Platform) {
23752375 - SwiftSDK $null `
23762376 - CacheScript $SourceCache \swift\cmake\caches\Runtime- $ ($Platform.OS.ToString ())- $ ($Platform.Architecture.LLVMName ).cmake `
23772377 - Defines ($PlatformDefines + @ {
2378- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
23792378 CMAKE_Swift_COMPILER_WORKS = " YES" ;
23802379 CMAKE_SYSTEM_NAME = $Platform.OS.ToString ();
23812380 LLVM_DIR = " $ ( Get-ProjectBinaryCache $Platform LLVM) \lib\cmake\llvm" ;
@@ -2496,7 +2495,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24962495 - Defines @ {
24972496 BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
24982497 CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2499- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
25002498 # TODO(compnerd) enforce dynamic linking of BlocksRuntime and dispatch.
25012499 CMAKE_CXX_FLAGS = $ (if ($Static ) { @ (" -Ddispatch_STATIC" ) } else { @ () });
25022500 CMAKE_Swift_FLAGS = $ (if ($Static ) { @ (" -Xcc" , " -static-libclosure" ) } else { @ () });
@@ -2522,7 +2520,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25222520 - Defines @ {
25232521 BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
25242522 CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2525- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
25262523 CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
25272524
25282525 SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2539,7 +2536,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25392536 - Defines @ {
25402537 BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
25412538 CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2542- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
25432539 CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
25442540
25452541 SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2556,7 +2552,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25562552 - Defines @ {
25572553 BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
25582554 CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2559- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
25602555 CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
25612556
25622557 SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2574,8 +2569,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25742569 - Defines @ {
25752570 BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
25762571 CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2572+ # FIXME(#83449): avoid using `SwiftCMakeConfig.h`
25772573 CMAKE_CXX_FLAGS = @ (" -I${RuntimeBinaryCache} \include" );
2578- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
25792574 CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
25802575
25812576 SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2593,8 +2588,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25932588 - Defines @ {
25942589 BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
25952590 CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2591+ # FIXME(#83449): avoid using `SwiftCMakeConfig.h`
25962592 CMAKE_CXX_FLAGS = @ (" -I${RuntimeBinaryCache} \include" );
2597- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
25982593 CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
25992594
26002595 SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2611,7 +2606,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
26112606 - Defines @ {
26122607 BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
26132608 CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2614- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
26152609 CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
26162610
26172611 SwiftCore_DIR = " ${RuntimeBinaryCache} \cmake\SwiftCore" ;
@@ -2958,7 +2952,6 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
29582952 - Defines @ {
29592953 BUILD_SHARED_LIBS = " NO" ;
29602954 CMAKE_FIND_PACKAGE_PREFER_CONFIG = " YES" ;
2961- CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform );
29622955 CMAKE_Swift_FLAGS = @ (" -static-stdlib" , " -Xfrontend" , " -use-static-resource-dir" );
29632956 CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
29642957
0 commit comments