@@ -188,7 +188,7 @@ cmake ^
188188cmake --build " %BuildRoot% \curl" || (exit /b)
189189cmake --build " %BuildRoot% \curl" --target install || (exit /b)
190190
191- path %BuildRoot% \toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a \PFiles64\Swift\Runtimes\0.0.0\ usr\bin;%BuildRoot% \toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a\PFiles64\Swift \Toolchains\0.0.0+ Asserts\usr\bin;%Path%
191+ path %BuildRoot% \toolchains\5.9.0 \PFiles64\Swift\runtime-development\ usr\bin;%BuildRoot% \toolchains\5.9.0\Library\Developer \Toolchains\unknown- Asserts-development.xctoolchain \usr\bin;%Path%
192192
193193:: Build Swift Syntax
194194cmake ^
@@ -201,8 +201,8 @@ cmake ^
201201 -D CMAKE_CXX_COMPILER=cl ^
202202 -D CMAKE_CXX_FLAGS=" /GS- /Oy /Gw /Gy" ^
203203 -D CMAKE_MT=mt ^
204- -D CMAKE_Swift_COMPILER=%BuildRoot% /toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift /Toolchains/0.0.0+ Asserts/usr/bin/swiftc.exe ^
205- -D CMAKE_Swift_FLAGS=" -sdk %BuildRoot% /toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift /Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
204+ -D CMAKE_Swift_COMPILER=%BuildRoot% /toolchains/5.9.0/Library/Developer /Toolchains/unknown- Asserts-development.xctoolchain /usr/bin/swiftc.exe ^
205+ -D CMAKE_Swift_FLAGS=" -sdk %BuildRoot% /toolchains/5.9.0/Library/Developer /Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
206206 -D CMAKE_EXE_LINKER_FLAGS=" /INCREMENTAL:NO" ^
207207 -D CMAKE_SHARED_LINKER_FLAGS=" /INCREMENTAL:NO" ^
208208
@@ -232,8 +232,8 @@ cmake ^
232232
233233 -D CMAKE_INSTALL_PREFIX=" %InstallRoot% " ^
234234
235- -D CMAKE_Swift_COMPILER=" %BuildRoot% /toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift /Toolchains/0.0.0+ Asserts/usr/bin/swiftc.exe" ^
236- -D CMAKE_Swift_FLAGS=" -sdk %BuildRoot% /toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift /Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
235+ -D CMAKE_Swift_COMPILER=" %BuildRoot% /toolchains/5.9.0/Library/Developer /Toolchains/unknown- Asserts-development.xctoolchain /usr/bin/swiftc.exe" ^
236+ -D CMAKE_Swift_FLAGS=" -sdk %BuildRoot% /toolchains/5.9.0/Library/Developer /Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
237237
238238 -D LLVM_DEFAULT_TARGET_TRIPLE=x86_64-unknown-windows-msvc ^
239239
@@ -261,7 +261,7 @@ cmake ^
261261 -D SWIFT_PATH_TO_LIBDISPATCH_SOURCE=" %SourceRoot% \swift-corelibs-libdispatch" ^
262262 -D SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=" %SourceRoot% \swift-syntax" ^
263263 -D SWIFT_PATH_TO_STRING_PROCESSING_SOURCE=%SourceRoot% \swift-experimental-string-processing ^
264- -D SWIFT_PATH_TO_SWIFT_SDK=" %BuildRoot% /toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift /Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
264+ -D SWIFT_PATH_TO_SWIFT_SDK=" %BuildRoot% /toolchains/5.9.0/Library/Developer /Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
265265
266266 -G Ninja ^
267267 -S llvm-project\llvm || (exit /b)
@@ -867,12 +867,12 @@ endlocal
867867:FetchX64Toolchain
868868setlocal enableextensions enabledelayedexpansion
869869
870- curl.exe -k -sOL " https://download.swift.org/development /windows10/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a /swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a -windows10.exe" || (exit /b)
871- " WiX-4.0.1\tools\net6.0\any\wix.exe" burn extract swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a -windows10.exe -o %BuildRoot% \toolchains || (exit /b)
872- msiexec.exe /qn /a " %BuildRoot% \toolchains\a0" TARGETDIR=" %BuildRoot% \toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a\PFiles64\Swift\Runtimes\0.0.0\usr\bin \" || (exit /b)
873- msiexec.exe /qn /a " %BuildRoot% \toolchains\a1" TARGETDIR=" %BuildRoot% \toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a \" || (exit /b)
874- msiexec.exe /qn /a " %BuildRoot% \toolchains\a2" TARGETDIR=" %BuildRoot% \toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a \" || (exit /b)
875- msiexec.exe /qn /a " %BuildRoot% \toolchains\a5 " TARGETDIR=" %BuildRoot% \toolchains\swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a \" || (exit /b)
870+ curl.exe -k -sOL " https://download.swift.org/swift-5.9-release /windows10/swift-5.9-RELEASE /swift-5.9-RELEASE -windows10.exe" || (exit /b)
871+ " WiX-4.0.1\tools\net6.0\any\wix.exe" burn extract swift-5.9-RELEASE -windows10.exe -o %BuildRoot% \toolchains || (exit /b)
872+ msiexec.exe /qn /a " %BuildRoot% \toolchains\a0" TARGETDIR=" %BuildRoot% \toolchains\5.9.0 \" || (exit /b)
873+ msiexec.exe /qn /a " %BuildRoot% \toolchains\a1" TARGETDIR=" %BuildRoot% \toolchains\5.9.0 \" || (exit /b)
874+ msiexec.exe /qn /a " %BuildRoot% \toolchains\a2" TARGETDIR=" %BuildRoot% \toolchains\5.9.0 \" || (exit /b)
875+ msiexec.exe /qn /a " %BuildRoot% \toolchains\a3 " TARGETDIR=" %BuildRoot% \toolchains\5.9.0 \" || (exit /b)
876876
877877goto :eof
878878endlocal
0 commit comments