Skip to content

Commit 71ed808

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 ebfaf29 commit 71ed808

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
@@ -1677,9 +1677,6 @@ function Build-CMakeProject {
16771677
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
16781678
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform)
16791679

1680-
# TODO(compnerd): remove this once we have the early swift-driver
1681-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
1682-
16831680
[string[]] $SwiftFlags = @();
16841681

16851682
$SwiftFlags += if ($SwiftSDK) {
@@ -1796,9 +1793,6 @@ function Build-CMakeProject {
17961793
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
17971794
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform)
17981795

1799-
# TODO(compnerd) remove this once we have the early swift-driver
1800-
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
1801-
18021796
[string[]] $SwiftFlags = @()
18031797

18041798
$SwiftFlags += if ($SwiftSDK) {
@@ -2253,6 +2247,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [string] $Variant, [switch]
22532247
SWIFT_TOOLCHAIN_VERSION = "${ToolchainIdentifier}";
22542248
SWIFT_BUILD_SWIFT_SYNTAX = "YES";
22552249
SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
2250+
SWIFT_EARLY_SWIFT_DRIVER_BUILD = "$(Get-ProjectBinaryCache $BuildPlatform EarlySwiftDriver)\bin";
22562251
SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
22572252
SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";
22582253
SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = "YES";

0 commit comments

Comments
 (0)