Skip to content

Commit 33f30f0

Browse files
authored
Merge pull request #85007 from etcwilde/ewilde/windows-pass-target-triple
Windows: Pass full target triple to build
2 parents 4c9a9ca + e64ed37 commit 33f30f0

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

utils/build.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,7 +1683,7 @@ function Build-CMakeProject {
16831683
}
16841684

16851685
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
1686-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform)
1686+
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
16871687

16881688
# TODO(compnerd): remove this once we have the early swift-driver
16891689
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
@@ -1802,7 +1802,7 @@ function Build-CMakeProject {
18021802
Join-Path -Path (Get-PinnedToolchainToolsDir) -ChildPath "swiftc.exe"
18031803
}
18041804
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
1805-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform)
1805+
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
18061806

18071807
# TODO(compnerd) remove this once we have the early swift-driver
18081808
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
@@ -2973,7 +2973,6 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
29732973
-Defines @{
29742974
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
29752975
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
2976-
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
29772976
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
29782977

29792978
SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";

0 commit comments

Comments
 (0)