Skip to content

Commit dc5a7d1

Browse files
authored
Merge pull request swiftlang#75482 from hjyamauchi/release/6.0
2 parents d73520c + 3b079a0 commit dc5a7d1

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

utils/build.ps1

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ function Build-CMakeProject {
866866
}
867867

868868
if ($UseBuiltCompilers.Contains("Swift")) {
869-
$env:Path = "$($HostArch.SDKInstallRoot)\usr\bin;$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($HostArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
869+
$env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$($BuildArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
870870
} elseif ($UsePinnedCompilers.Contains("Swift")) {
871871
$env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"
872872
}
@@ -1718,7 +1718,7 @@ function Build-Driver($Arch) {
17181718
-Bin (Get-HostProjectBinaryCache Driver) `
17191719
-InstallTo "$($Arch.ToolchainInstallRoot)\usr" `
17201720
-Arch $Arch `
1721-
-UseBuiltCompilers Swift `
1721+
-UseBuiltCompilers C,CXX,Swift `
17221722
-SwiftSDK ([IO.Path]::Combine((Get-InstallDir $HostArch), "Platforms", "Windows.platform", "Developer", "SDKs", "Windows.sdk")) `
17231723
-BuildTargets default `
17241724
-Defines @{
@@ -1730,6 +1730,11 @@ function Build-Driver($Arch) {
17301730
ArgumentParser_DIR = (Get-HostProjectCMakeModules ArgumentParser);
17311731
SQLite3_INCLUDE_DIR = "$LibraryRoot\sqlite-3.43.2\usr\include";
17321732
SQLite3_LIBRARY = "$LibraryRoot\sqlite-3.43.2\usr\lib\SQLite3.lib";
1733+
SWIFT_DRIVER_BUILD_TOOLS = "YES";
1734+
LLVM_DIR = "$(Get-HostProjectBinaryCache Compilers)\lib\cmake\llvm";
1735+
Clang_DIR = "$(Get-HostProjectBinaryCache Compilers)\lib\cmake\clang";
1736+
Swift_DIR = "$(Get-HostProjectBinaryCache Compilers)\tools\swift\lib\cmake\swift";
1737+
CMAKE_CXX_FLAGS = "-Xclang -fno-split-cold-code";
17331738
}
17341739
}
17351740

0 commit comments

Comments
 (0)