Skip to content

Commit c40d883

Browse files
committed
utils: enable the early swift-driver for Windows
Enable the use of the early swift-driver to build the Swift toolchain. This is the first step towards removing the accumulated debt and workarounds when building the toolchain on Windows.
1 parent 573a019 commit c40d883

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

utils/build.ps1

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,9 +1716,6 @@ function Build-CMakeProject {
17161716
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
17171717
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
17181718

1719-
# TODO(compnerd): remove this once we have the early swift-driver
1720-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
1721-
17221719
[string[]] $SwiftFlags = @();
17231720

17241721
$SwiftFlags += if ($SwiftSDK) {
@@ -1835,9 +1832,6 @@ function Build-CMakeProject {
18351832
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
18361833
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
18371834

1838-
# TODO(compnerd) remove this once we have the early swift-driver
1839-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
1840-
18411835
[string[]] $SwiftFlags = @()
18421836

18431837
$SwiftFlags += if ($SwiftSDK) {
@@ -2292,6 +2286,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [string] $Variant, [switch]
22922286
SWIFT_TOOLCHAIN_VERSION = "${ToolchainIdentifier}";
22932287
SWIFT_BUILD_SWIFT_SYNTAX = "YES";
22942288
SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
2289+
SWIFT_EARLY_SWIFT_DRIVER_BUILD = "$(Get-ProjectBinaryCache $BuildPlatform EarlySwiftDriver)\bin";
22952290
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
22962291
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";
22972292
SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = "YES";

0 commit comments

Comments
 (0)