[CMake] Merge Clang's features file with Swift's #41547
Merged
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
bnbarham
commented
Feb 24, 2022
| @@ -6,16 +6,18 @@ add_dependencies(swiftOption | |||
| target_link_libraries(swiftOption PRIVATE | |||
| swiftBasic) | |||
|
|
|||
| set(features_file_src "${CMAKE_CURRENT_SOURCE_DIR}/features.json") | |||
| set(features_file_swift_src "${CMAKE_CURRENT_SOURCE_DIR}/features.json") | |||
| set(features_file_clang_src "${LLVM_MAIN_SRC_DIR}/../clang/tools/driver/features.json") | |||
There was a problem hiding this comment.
This feels very wrong to me, if there's a better way to do this please let me know 🙇
|
@swift-ci please test |
bnbarham
force-pushed
the
merge-clang-features
branch
from
9f8fb78 to
79e8116
Compare
|
@swift-ci please test |
akyrtzi
approved these changes
Feb 25, 2022
| set(features_file_dest "${CMAKE_BINARY_DIR}/share/swift/features.json") | ||
|
|
||
| add_custom_command( | ||
| OUTPUT | ||
| ${features_file_dest} | ||
| COMMAND | ||
| ${CMAKE_COMMAND} -E copy ${features_file_src} ${features_file_dest} | ||
| ${SWIFT_SOURCE_DIR}/utils/merge-features.py -f ${features_file_swift_src} -p \"\" -f ${features_file_clang_src} -p clang- ${features_file_dest} | ||
| DEPENDS |
There was a problem hiding this comment.
You should also add a dependency on the merge-features.py script itself.
There was a problem hiding this comment.
Oh nice catch, thanks!
Clang has a new `redirecting-with` property in the VFS overlay files. While this could be added to Swift's features as well, it is generally the case that features provided by Clang can also be useful to know for clients of Swift. Merge the features from Clang into Swift's features file with the "clang-" prefix to differentiate them.
bnbarham
force-pushed
the
merge-clang-features
branch
from
79e8116 to
914b984
Compare
|
@swift-ci please test |
|
This seems to cause problems on some build configurations. The installation may attempt to install the target multiple files and using the feature merger rather than the previous |
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.
Clang has a new
redirecting-withproperty in the VFS overlay files.While this could be added to Swift's features as well, it is generally
the case that features provided by Clang can also be useful to know for
clients of Swift. Merge the features from Clang into Swift's features
file with the "clang-" prefix to differentiate them.