Skip to content

Commit 2f2051d

Browse files
authored
Merge pull request #83729 from Steelskin/fabrice/remove-unused-sdk-configure-args
utils: Remove unused CMake args in the SDK jobs
2 parents 0f963d7 + 9b8fbfe commit 2f2051d

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

utils/build.ps1

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2818,14 +2818,12 @@ function Build-Foundation {
28182818
-Bin $FoundationBinaryCache `
28192819
-InstallTo $FoundationImage `
28202820
-Platform $Platform `
2821-
-UseBuiltCompilers ASM,C,CXX,Swift `
2821+
-UseBuiltCompilers C,CXX,Swift `
28222822
-SwiftSDK $SwiftSDK `
28232823
-Defines @{
28242824
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
2825-
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
28262825
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
28272826
CMAKE_Swift_FLAGS = $SwiftFlags;
2828-
ENABLE_TESTING = "NO";
28292827
FOUNDATION_BUILD_TOOLS = if ($Platform.OS -eq [OS]::Windows) { "YES" } else { "NO" };
28302828
CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
28312829
LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
@@ -2836,7 +2834,6 @@ function Build-Foundation {
28362834
};
28372835
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
28382836
dispatch_DIR = $DispatchCMakeModules;
2839-
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
28402837
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
28412838
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
28422839
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
@@ -2938,14 +2935,13 @@ function Build-Testing([Hashtable] $Platform) {
29382935
-Bin (Get-ProjectBinaryCache $Platform Testing) `
29392936
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform.OS), "Developer", "Library", "Testing-$ProductVersion", "usr"))" `
29402937
-Platform $Platform `
2941-
-UseBuiltCompilers C,CXX,Swift `
2938+
-UseBuiltCompilers CXX,Swift `
29422939
-SwiftSDK (Get-SwiftSDK $Platform.OS) `
29432940
-Defines @{
29442941
BUILD_SHARED_LIBS = "YES";
29452942
CMAKE_INSTALL_BINDIR = $Platform.BinaryDir;
29462943
dispatch_DIR = (Get-ProjectCMakeModules $Platform Dispatch);
29472944
Foundation_DIR = (Get-ProjectCMakeModules $Platform DynamicFoundation);
2948-
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
29492945
SwiftTesting_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform TestingMacros)\TestingMacros.dll";
29502946
SwiftTesting_INSTALL_NESTED_SUBDIR = "YES";
29512947
}

0 commit comments

Comments
 (0)