Skip to content

Commit 696488a

Browse files
committed
utils: build makeOption when building with build.ps1
As `build.ps1` is used both for development and for CI, enable the building for `makeOption` tool in swift-driver to ease development. Cherry pick commit 1bc7232
1 parent cab91dc commit 696488a

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

utils/build.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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)