@@ -2818,14 +2818,12 @@ function Build-Foundation {
2818
2818
- Bin $FoundationBinaryCache `
2819
2819
- InstallTo $FoundationImage `
2820
2820
- Platform $Platform `
2821
- - UseBuiltCompilers ASM , C, CXX, Swift `
2821
+ - UseBuiltCompilers C, CXX, Swift `
2822
2822
- SwiftSDK $SwiftSDK `
2823
2823
- Defines @ {
2824
2824
BUILD_SHARED_LIBS = if ($Static ) { " NO" } else { " YES" };
2825
- CMAKE_NINJA_FORCE_RESPONSE_FILE = " YES" ;
2826
2825
CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
2827
2826
CMAKE_Swift_FLAGS = $SwiftFlags ;
2828
- ENABLE_TESTING = " NO" ;
2829
2827
FOUNDATION_BUILD_TOOLS = if ($Platform.OS -eq [OS ]::Windows) { " YES" } else { " NO" };
2830
2828
CURL_DIR = " $BinaryCache \$ ( $Platform.Triple ) \usr\lib\cmake\CURL" ;
2831
2829
LibXml2_DIR = " $BinaryCache \$ ( $Platform.Triple ) \usr\lib\cmake\libxml2-2.11.5" ;
@@ -2836,7 +2834,6 @@ function Build-Foundation {
2836
2834
};
2837
2835
ZLIB_INCLUDE_DIR = " $BinaryCache \$ ( $Platform.Triple ) \usr\include" ;
2838
2836
dispatch_DIR = $DispatchCMakeModules ;
2839
- SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
2840
2837
_SwiftFoundation_SourceDIR = " $SourceCache \swift-foundation" ;
2841
2838
_SwiftFoundationICU_SourceDIR = " $SourceCache \swift-foundation-icu" ;
2842
2839
_SwiftCollections_SourceDIR = " $SourceCache \swift-collections" ;
@@ -2938,14 +2935,13 @@ function Build-Testing([Hashtable] $Platform) {
2938
2935
- Bin (Get-ProjectBinaryCache $Platform Testing) `
2939
2936
- InstallTo " $ ( [IO.Path ]::Combine((Get-PlatformRoot $Platform.OS ), " Developer" , " Library" , " Testing-$ProductVersion " , " usr" )) " `
2940
2937
- Platform $Platform `
2941
- - UseBuiltCompilers C , CXX, Swift `
2938
+ - UseBuiltCompilers CXX, Swift `
2942
2939
- SwiftSDK (Get-SwiftSDK $Platform.OS ) `
2943
2940
- Defines @ {
2944
2941
BUILD_SHARED_LIBS = " YES" ;
2945
2942
CMAKE_INSTALL_BINDIR = $Platform.BinaryDir ;
2946
2943
dispatch_DIR = (Get-ProjectCMakeModules $Platform Dispatch);
2947
2944
Foundation_DIR = (Get-ProjectCMakeModules $Platform DynamicFoundation);
2948
- SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
2949
2945
SwiftTesting_MACRO = " $ ( Get-ProjectBinaryCache $BuildPlatform TestingMacros) \TestingMacros.dll" ;
2950
2946
SwiftTesting_INSTALL_NESTED_SUBDIR = " YES" ;
2951
2947
}
0 commit comments