Skip to content

Commit d482ab7

Browse files
committed
Update the pinned toolchain for Windows and enable SwiftCompilerSources for Win/ARM64
1 parent 8553f99 commit d482ab7

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -950,12 +950,6 @@ if (NOT BOOTSTRAPPING_MODE)
950950
message(FATAL_ERROR "turning off bootstrapping is not supported anymore")
951951
endif()
952952

953-
# As a temporary workaround, disable SwiftCompilerSources on
954-
# Windows/ARM64 because the compiler segfaults
955-
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64")
956-
set(BOOTSTRAPPING_MODE "OFF")
957-
endif()
958-
959953
set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin")
960954
set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib")
961955
if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")

utils/build.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,14 @@ if ($null -eq $BuildArchName) { $BuildArchName = $env:PROCESSOR_ARCHITECTURE }
166166
if ($PinnedBuild -eq "") {
167167
switch ($BuildArchName) {
168168
"AMD64" {
169-
$PinnedBuild = "https://download.swift.org/swift-5.10.1-release/windows10/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-windows10.exe"
170-
$PinnedSHA256 = "3027762138ACFA1BBE3050FF6613BBE754332E84C9EFA5C23984646009297286"
171-
$PinnedVersion = "5.10.1"
169+
$PinnedBuild = "https://download.swift.org/swift-6.0.3-release/windows10/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-windows10.exe"
170+
$PinnedSHA256 = "AB205D83A38047882DB80E6A88C7D33B651F3BAC96D4515D7CBA5335F37999D3"
171+
$PinnedVersion = "6.0.3"
172172
}
173173
"ARM64" {
174-
$PinnedBuild = "https://download.swift.org/development/windows10-arm64/swift-DEVELOPMENT-SNAPSHOT-2024-07-02-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-02-a-windows10-arm64.exe"
175-
$PinnedSHA256 = "037BDBF9D1A1A99D7156584948870A8A958FD27CC4FF5711691CC0A76F2E88F5"
176-
$PinnedVersion = "0.0.0"
174+
$PinnedBuild = "https://download.swift.org/swift-6.0.3-release/windows10-arm64/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-windows10-arm64.exe"
175+
$PinnedSHA256 = "81474651E59A9955C9E6A389EF53ABD61631FFC62C63A2A02977271019E7C722"
176+
$PinnedVersion = "6.0.3"
177177
}
178178
default { throw "Unsupported processor architecture" }
179179
}

0 commit comments

Comments
 (0)