Skip to content

Commit 8478355

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 6fc9386 commit 8478355

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
@@ -1692,9 +1692,6 @@ function Build-CMakeProject {
16921692
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
16931693
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
16941694

1695-
# TODO(compnerd): remove this once we have the early swift-driver
1696-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
1697-
16981695
[string[]] $SwiftFlags = @();
16991696

17001697
$SwiftFlags += if ($SwiftSDK) {
@@ -1811,9 +1808,6 @@ function Build-CMakeProject {
18111808
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
18121809
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
18131810

1814-
# TODO(compnerd) remove this once we have the early swift-driver
1815-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
1816-
18171811
[string[]] $SwiftFlags = @()
18181812

18191813
$SwiftFlags += if ($SwiftSDK) {
@@ -2268,6 +2262,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [string] $Variant, [switch]
22682262
SWIFT_TOOLCHAIN_VERSION = "${ToolchainIdentifier}";
22692263
SWIFT_BUILD_SWIFT_SYNTAX = "YES";
22702264
SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
2265+
SWIFT_EARLY_SWIFT_DRIVER_BUILD = "$(Get-ProjectBinaryCache $BuildPlatform EarlySwiftDriver)\bin";
22712266
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
22722267
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";
22732268
SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = "YES";

0 commit comments

Comments
 (0)