Skip to content

Commit 19049aa

Browse files
committed
build.ps1: remove unnecessary CMake options
Remove `CMAKE_SYSTEM_NAME` and `CMAKEY_Swift_COMPILER_WORKS` from the CMake invocation for building the experimental SDK.
1 parent 12fa83e commit 19049aa

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

utils/build.ps1

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2523,12 +2523,10 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25232523
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25242524
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
25252525
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
2526-
CMAKE_Swift_COMPILER_WORKS = "YES";
25272526
# TODO(compnerd) enforce dynamic linking of BlocksRuntime and dispatch.
25282527
CMAKE_CXX_FLAGS = $(if ($Static) { @("-Ddispatch_STATIC") } else { @() });
25292528
CMAKE_Swift_FLAGS = $(if ($Static) { @("-Xcc", "-static-libclosure") } else { @() });
25302529
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2531-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25322530

25332531
# NOTE(compnerd) we can get away with this currently because we only
25342532
# use the C portion of the dispatch build, which is supposed to always
@@ -2550,9 +2548,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25502548
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25512549
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
25522550
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
2553-
CMAKE_Swift_COMPILER_WORKS = "YES";
25542551
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2555-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25562552

25572553
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
25582554
}
@@ -2568,9 +2564,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25682564
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25692565
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
25702566
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
2571-
CMAKE_Swift_COMPILER_WORKS = "YES";
25722567
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2573-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25742568

25752569
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
25762570
}
@@ -2586,9 +2580,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25862580
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25872581
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
25882582
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
2589-
CMAKE_Swift_COMPILER_WORKS = "YES";
25902583
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2591-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25922584

25932585
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
25942586
SwiftOverlay_DIR = "${OverlayBinaryCache}\cmake\SwiftOverlay";
@@ -2606,9 +2598,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
26062598
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
26072599
CMAKE_CXX_FLAGS = @("-I${RuntimeBinaryCache}\include");
26082600
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
2609-
CMAKE_Swift_COMPILER_WORKS = "YES";
26102601
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2611-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
26122602

26132603
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
26142604
SwiftOverlay_DIR = "${OverlayBinaryCache}\cmake\SwiftOverlay";
@@ -2626,9 +2616,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
26262616
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
26272617
CMAKE_CXX_FLAGS = @("-I${RuntimeBinaryCache}\include");
26282618
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
2629-
CMAKE_Swift_COMPILER_WORKS = "YES";
26302619
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2631-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
26322620

26332621
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
26342622
SwiftOverlay_DIR = "${OverlayBinaryCache}\cmake\SwiftOverlay";
@@ -2645,9 +2633,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
26452633
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
26462634
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
26472635
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
2648-
CMAKE_Swift_COMPILER_WORKS = "YES";
26492636
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2650-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
26512637

26522638
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
26532639
SwiftOverlay_DIR = "${OverlayBinaryCache}\cmake\SwiftOverlay";
@@ -2989,10 +2975,8 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
29892975
BUILD_SHARED_LIBS = "NO";
29902976
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
29912977
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
2992-
CMAKE_Swift_COMPILER_WORKS = "YES";
29932978
CMAKE_Swift_FLAGS = @("-static-stdlib", "-Xfrontend", "-use-static-resource-dir");
29942979
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
2995-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
29962980

29972981
ENABLE_SWIFT = "YES";
29982982
}

0 commit comments

Comments
 (0)