averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "utils: Remove unused CMake args in the SDK jobs"

Browse Source
This commit is contained in:
Arnold Schwaighofer
2025-08-18 10:31:32 -07:00
committed by GitHub
parent 37663cef2c
commit 8e9a8bfc40
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/build.ps1
View File

@@ -2841,12 +2841,14 @@ function Build-Foundation {
-Bin $FoundationBinaryCache `
-InstallTo $FoundationImage `
-Platform $Platform `
-UseBuiltCompilers C,CXX,Swift `
-UseBuiltCompilers ASM,C,CXX,Swift `
-SwiftSDK $SwiftSDK `
-Defines @{
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
CMAKE_Swift_FLAGS = $SwiftFlags;
ENABLE_TESTING = "NO";
FOUNDATION_BUILD_TOOLS = if ($Platform.OS -eq [OS]::Windows) { "YES" } else { "NO" };
CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
@@ -2857,6 +2859,7 @@ function Build-Foundation {
};
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
dispatch_DIR = $DispatchCMakeModules;
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
@@ -2962,13 +2965,14 @@ function Build-Testing([Hashtable] $Platform) {
-Bin (Get-ProjectBinaryCache $Platform Testing) `
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform.OS), "Developer", "Library", "Testing-$ProductVersion", "usr"))" `
-Platform $Platform `
-UseBuiltCompilers CXX,Swift `
-UseBuiltCompilers C,CXX,Swift `
-SwiftSDK (Get-SwiftSDK $Platform.OS) `
-Defines @{
BUILD_SHARED_LIBS = "YES";
CMAKE_INSTALL_BINDIR = $Platform.BinaryDir;
dispatch_DIR = (Get-ProjectCMakeModules $Platform Dispatch);
Foundation_DIR = (Get-ProjectCMakeModules $Platform DynamicFoundation);
SwiftSyntax_DIR = (Get-ProjectBinaryCache $HostPlatform Compilers);
SwiftTesting_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform TestingMacros)\TestingMacros.dll";
SwiftTesting_INSTALL_NESTED_SUBDIR = "YES";
}