[Build] Use 5.9.0 toolchain rather than a main snapshot #68835
Conversation
|
@swift-ci please test |
| @@ -201,8 +201,8 @@ cmake ^ | |||
| -D CMAKE_CXX_COMPILER=cl ^ | |||
| -D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^ | |||
| -D CMAKE_MT=mt ^ | |||
| -D CMAKE_Swift_COMPILER=%BuildRoot%/toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift/Toolchains/0.0.0+Asserts/usr/bin/swiftc.exe ^ | |||
There was a problem hiding this comment.
hmm, that 0.0.0+Asserts might be load-bearing. I can't seem to find where DEVTOOLS_ROOT is specified in all of the XML, and I seem to have borked my Windows install so I can't just look at how it installs at the moment.
There was a problem hiding this comment.
Yeah, the 0.0.0+Asserts is the development builds. 5.9 did not get the new layout changes, so this should be correct.
There was a problem hiding this comment.
🤔 FWIW this is basically a cherry-pick of the 5.9 change. https://github.com/apple/swift/blob/102c60bba8b3b7406302095f4351096ef6ab7bcf/utils/build-windows-toolchain.bat#L208
Fetch and extract a prebuilt toolchain to enable macros support on 5.10. This is a squashed cherry-pick of swiftlang#68319, swiftlang#68641, and swiftlang#68835.
| @@ -201,8 +201,8 @@ cmake ^ | |||
| -D CMAKE_CXX_COMPILER=cl ^ | |||
| -D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^ | |||
| -D CMAKE_MT=mt ^ | |||
| -D CMAKE_Swift_COMPILER=%BuildRoot%/toolchains/swift-DEVELOPMENT-SNAPSHOT-2023-08-12-a/PFiles64/Swift/Toolchains/0.0.0+Asserts/usr/bin/swiftc.exe ^ | |||
There was a problem hiding this comment.
Yeah, the 0.0.0+Asserts is the development builds. 5.9 did not get the new layout changes, so this should be correct.
|
Windows failure: |
The main snapshot was being used as we needed C++ interop changes. They're in the released 5.9.0 though, so update to a proper release instead.
bnbarham
force-pushed
the
use-5.9-toolchain-on-windows
branch
from
4f74c75 to
912e931
Compare
|
I have no idea how I managed that 🤔 Anyway, fixed. |
|
@swift-ci please test |
Fetch and extract a prebuilt toolchain to enable macros support on 5.10. This is a squashed cherry-pick of swiftlang#68319, swiftlang#68641, and swiftlang#68835.
|
@swift-ci please test |
|
Linux test failure: This should have been fixed last night. |
|
@swift-ci please test Linux |
Fetch and extract a prebuilt toolchain to enable macros support on 5.10. This is a squashed cherry-pick of swiftlang#68319, swiftlang#68411, swiftlang#68641, and swiftlang#68835.
The main snapshot was being used as we needed C++ interop changes. They're in the released 5.9.0 though, so update to a proper release instead.