averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[build] Merge Clang's features.json from binary directory, handle values

Browse Source
This commit is contained in:
Jan Svoboda
2022-06-06 14:49:38 +02:00
parent 5b77b32203
commit f9c5c45e7a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Option/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ target_link_libraries(swiftOption PRIVATE
set(features_merger "${SWIFT_SOURCE_DIR}/utils/merge-features.py")
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")
set(features_file_clang_src "${LLVM_BINARY_DIR}/share/clang/features.json")
set(features_file_dest "${CMAKE_BINARY_DIR}/share/swift/features.json")
add_custom_command(

7
utils/merge-features.py
View File

@@ -52,7 +52,12 @@ def read_features(from_file, add_prefix):
if "name" not in feature:
invalid_file(from_file, "missing name in features list")
features.append({"name": add_prefix + feature["name"]})
new_feature = {"name": add_prefix + feature["name"]}
if "value" in feature:
new_feature.update({"value" : feature["value"]})
features.append(new_feature)
return features