Skip to content

Commit 83ee8eb

Browse files
committed
Update the pinned toolchain for Windows and enable SwiftCompilerSources for Win/ARM64
1 parent f1f1051 commit 83ee8eb

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
@@ -190,14 +190,14 @@ $Components = @{
190190
Hash = "429ada77e7f30e4bd8ff22953a1f35f98b2728e84c9b1d006712561785641f69"
191191
}
192192
PinnedSwiftAMD64 = @{
193-
URL = "https://download.swift.org/swift-5.10.1-release/windows10/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-windows10.exe"
194-
Hash = "3027762138ACFA1BBE3050FF6613BBE754332E84C9EFA5C23984646009297286"
195-
Version = "5.10.1"
193+
URL = "https://download.swift.org/swift-6.0-branch/windows10/swift-6.0-DEVELOPMENT-SNAPSHOT-2024-12-03-a/swift-6.0-DEVELOPMENT-SNAPSHOT-2024-12-03-a-windows10.exe"
194+
Hash = "2058299F63C2A032D7EF582B8469D28832C9EA44D5FDCB54F17FEC00B184E7D2"
195+
Version = "6.0.0"
196196
}
197197
PinnedSwiftARM64 = @{
198-
URL = "https://download.swift.org/development/windows10-arm64/swift-DEVELOPMENT-SNAPSHOT-2024-07-02-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-02-a-windows10-arm64.exe"
199-
Hash = "037BDBF9D1A1A99D7156584948870A8A958FD27CC4FF5711691CC0A76F2E88F5"
200-
Version = "0.0.0"
198+
URL = "https://download.swift.org/swift-6.0-branch/windows10-arm64/swift-6.0-DEVELOPMENT-SNAPSHOT-2024-12-03-a/swift-6.0-DEVELOPMENT-SNAPSHOT-2024-12-03-a-windows10-arm64.exe"
199+
Hash = "239C3B2D9D470AD9D4519AE8DC556A331CE6DA46895F0908A97DF6528CFA740A"
200+
Version = "6.0.0"
201201
}
202202
PinnedSwiftCustom = @{
203203
URL = $PinnedBuild

0 commit comments

Comments
 (0)