Skip to content

Commit b2fb6f5

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 96f4c08 commit b2fb6f5

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

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

16991696
$SwiftFlags += if ($SwiftSDK) {
@@ -1810,9 +1807,6 @@ function Build-CMakeProject {
18101807
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
18111808
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
18121809

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

18181812
$SwiftFlags += if ($SwiftSDK) {
@@ -2267,6 +2261,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [string] $Variant, [switch]
22672261
SWIFT_TOOLCHAIN_VERSION = "${ToolchainIdentifier}";
22682262
SWIFT_BUILD_SWIFT_SYNTAX = "YES";
22692263
SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
2264+
SWIFT_EARLY_SWIFT_DRIVER_BUILD = "$(Get-ProjectBinaryCache $BuildPlatform EarlySwiftDriver)\bin";
22702265
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
22712266
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";
22722267
SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = "YES";

0 commit comments

Comments
 (0)