[5.9][CMake] Replace early swift-syntax with FetchContent #68872
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Sep 29, 2023
|
Nice, I slapped up my own 5.9 backport online a couple hours ago. |
1 similar comment
as long as the Swift parser integration is enabled. Also, remove redundant RPATH additions. (cherry picked from commit 537f318)
Instead of letting CMake set RPATH of the test executables, use INSTALL_RPATH and BUILD_WITH_INSTALL_RPATH just like other executable and shared libraries. Previously when a swift module link with exported swift-syntax targets e.g. 'SwiftSyntax::SwiftParser', the libraries in earlyswiftsyntax were used instead of the copied libraries in the swift build directory. That wasn't ideal. (cherry picked from commit 891d7b7)
`BOOTSTRAPPING_MODE` was used for configuring `SWIFT_ENABLE_ARRAY_COW_CHECKS` before it's fully fixed. (cherry picked from commit 06bffb9)
[CMake] Replace early swift-syntax with FetchContent (cherry picked from commit 8dbde04) Conflicts: lib/Frontend/PrintingDiagnosticConsumer.cpp lib/Parse/ParseType.cpp
rdar://116239522 (cherry picked from commit d0dfd75)
`.dylib` was hardcoded. Accept other platforms' shared library filenames (cherry picked from commit e9a183c)
After FetchContent changes, macros in Windows were disabled. (cherry picked from commit 00f9935)
build-windows-toolchain.bat used to build and install 'swift-syntax' for the compiler. Now that swift-syntax is built as a part of 'swift' build. So no need to built it separately anymore. (cherry picked from commit fc03e2e) Conflicts: utils/build-windows-toolchain.bat
rintaro
force-pushed
the
5.9-fetch-content
branch
from
3327d59 to
39f5938
Compare
1 similar comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick #68408 (and dependent #68273, #68388, and #68527) into
release/5.9swift-syntaxhost libraries using FetchContent rather than early-swiftsyntax. This simplifies the overall toolchain build process and fix the issues we've seen caused by swift-syntax not being rebuilt. We should be able to use this to fix cross-compiling on Linux