Skip to content

Commit 09e1921

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 550efca commit 09e1921

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
@@ -1710,9 +1710,6 @@ function Build-CMakeProject {
17101710
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
17111711
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
17121712

1713-
# TODO(compnerd): remove this once we have the early swift-driver
1714-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
1715-
17161713
[string[]] $SwiftFlags = @();
17171714

17181715
$SwiftFlags += if ($SwiftSDK) {
@@ -1829,9 +1826,6 @@ function Build-CMakeProject {
18291826
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
18301827
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
18311828

1832-
# TODO(compnerd) remove this once we have the early swift-driver
1833-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
1834-
18351829
[string[]] $SwiftFlags = @()
18361830

18371831
$SwiftFlags += if ($SwiftSDK) {
@@ -2291,6 +2285,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [string] $Variant, [switch]
22912285
SWIFT_TOOLCHAIN_VERSION = "${ToolchainIdentifier}";
22922286
SWIFT_BUILD_SWIFT_SYNTAX = "YES";
22932287
SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
2288+
SWIFT_EARLY_SWIFT_DRIVER_BUILD = "$(Get-ProjectBinaryCache $BuildPlatform EarlySwiftDriver)\bin";
22942289
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
22952290
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";
22962291
SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = "YES";

0 commit comments

Comments
 (0)