Skip to content

Commit fc38a45

Browse files
committed
build.ps1: remove remaining CMAKE_SYSTEM_NAME parameters
We compute the system name in `Build-CMakeProject` and do not need to explicitly pass this along.
1 parent 61958d4 commit fc38a45

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

utils/build.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,6 @@ function Build-LLVM([Hashtable] $Platform) {
21242124
-Platform $Platform `
21252125
-UseBuiltCompilers C,CXX `
21262126
-Defines @{
2127-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
21282127
LLVM_HOST_TRIPLE = $Platform.Triple;
21292128
}
21302129
}
@@ -2147,7 +2146,6 @@ function Build-Sanitizers([Hashtable] $Platform) {
21472146
-UseBuiltCompilers ASM,C,CXX `
21482147
-BuildTargets "install-compiler-rt" `
21492148
-Defines (@{
2150-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
21512149
LLVM_DIR = "$LLVMTargetCache\lib\cmake\llvm";
21522150
LLVM_ENABLE_PER_TARGET_RUNTIME_DIR = "YES";
21532151
COMPILER_RT_DEFAULT_TARGET_ONLY = "YES";
@@ -2161,7 +2159,6 @@ function Build-Sanitizers([Hashtable] $Platform) {
21612159
-UseBuiltCompilers ASM,C,CXX `
21622160
-BuildTargets "install-compiler-rt" `
21632161
-Defines (@{
2164-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
21652162
LLVM_DIR = "$LLVMTargetCache\lib\cmake\llvm";
21662163
LLVM_ENABLE_PER_TARGET_RUNTIME_DIR = "YES";
21672164
COMPILER_RT_DEFAULT_TARGET_ONLY = "YES";
@@ -2185,7 +2182,6 @@ function Build-ZLib([Hashtable] $Platform) {
21852182
-Defines @{
21862183
BUILD_SHARED_LIBS = "NO";
21872184
CMAKE_POSITION_INDEPENDENT_CODE = "YES";
2188-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
21892185
}
21902186
}
21912187

@@ -2199,7 +2195,6 @@ function Build-XML2([Hashtable] $Platform) {
21992195
-Defines @{
22002196
BUILD_SHARED_LIBS = "NO";
22012197
CMAKE_POSITION_INDEPENDENT_CODE = "YES";
2202-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
22032198
LIBXML2_WITH_ICONV = "NO";
22042199
LIBXML2_WITH_ICU = "NO";
22052200
LIBXML2_WITH_LZMA = "NO";
@@ -2230,7 +2225,6 @@ function Build-DS2([Hashtable] $Platform) {
22302225
-InstallTo "$(Get-PlatformRoot $Platform.OS)\Developer\Library\ds2\usr" `
22312226
-Platform $Platform `
22322227
-Defines @{
2233-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
22342228
DS2_REGSGEN2 = "$(Get-ProjectBinaryCache $BuildPlatform RegsGen2)/regsgen2.exe";
22352229
DS2_PROGRAM_PREFIX = "$(Get-ModuleTriple $Platform)-";
22362230
BISON_EXECUTABLE = "$(Get-BisonExecutable)";
@@ -2256,7 +2250,6 @@ function Build-CURL([Hashtable] $Platform) {
22562250
BUILD_SHARED_LIBS = "NO";
22572251
BUILD_TESTING = "NO";
22582252
CMAKE_POSITION_INDEPENDENT_CODE = "YES";
2259-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
22602253
BUILD_CURL_EXE = "NO";
22612254
BUILD_LIBCURL_DOCS = "NO";
22622255
BUILD_MISC_DOCS = "NO";
@@ -2369,7 +2362,6 @@ function Build-Runtime([Hashtable] $Platform) {
23692362
-CacheScript $SourceCache\swift\cmake\caches\Runtime-$($Platform.OS.ToString())-$($Platform.Architecture.LLVMName).cmake `
23702363
-Defines ($PlatformDefines + @{
23712364
CMAKE_Swift_COMPILER_WORKS = "YES";
2372-
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
23732365
LLVM_DIR = "$(Get-ProjectBinaryCache $Platform LLVM)\lib\cmake\llvm";
23742366
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
23752367
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";

0 commit comments

Comments
 (0)