@@ -866,7 +866,7 @@ function Build-CMakeProject {
866
866
}
867
867
868
868
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} "
870
870
} elseif ($UsePinnedCompilers.Contains (" Swift" )) {
871
871
$env: Path = " $ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
872
872
}
@@ -1718,7 +1718,7 @@ function Build-Driver($Arch) {
1718
1718
- Bin (Get-HostProjectBinaryCache Driver) `
1719
1719
- InstallTo " $ ( $Arch.ToolchainInstallRoot ) \usr" `
1720
1720
- Arch $Arch `
1721
- - UseBuiltCompilers Swift `
1721
+ - UseBuiltCompilers C , CXX , Swift `
1722
1722
- SwiftSDK ([IO.Path ]::Combine((Get-InstallDir $HostArch ), " Platforms" , " Windows.platform" , " Developer" , " SDKs" , " Windows.sdk" )) `
1723
1723
- BuildTargets default `
1724
1724
- Defines @ {
@@ -1730,6 +1730,11 @@ function Build-Driver($Arch) {
1730
1730
ArgumentParser_DIR = (Get-HostProjectCMakeModules ArgumentParser);
1731
1731
SQLite3_INCLUDE_DIR = " $LibraryRoot \sqlite-3.43.2\usr\include" ;
1732
1732
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" ;
1733
1738
}
1734
1739
}
1735
1740
0 commit comments