Skip to content

Commit a08bfb9

Browse files
authored
Merge pull request #41581 from apple/revert-41547-merge-clang-features
Revert "[CMake] Merge Clang's features file with Swift's"
2 parents b3bc295 + 1f690ff commit a08bfb9

File tree

2 files changed

+3
-95
lines changed

2 files changed

+3
-95
lines changed

lib/Option/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ add_dependencies(swiftOption
66
target_link_libraries(swiftOption PRIVATE
77
swiftBasic)
88

9-
set(features_merger "${SWIFT_SOURCE_DIR}/utils/merge-features.py")
10-
set(features_file_swift_src "${CMAKE_CURRENT_SOURCE_DIR}/features.json")
11-
set(features_file_clang_src "${LLVM_MAIN_SRC_DIR}/../clang/tools/driver/features.json")
9+
set(features_file_src "${CMAKE_CURRENT_SOURCE_DIR}/features.json")
1210
set(features_file_dest "${CMAKE_BINARY_DIR}/share/swift/features.json")
1311

1412
add_custom_command(
1513
OUTPUT
1614
${features_file_dest}
1715
COMMAND
18-
${features_merger} -f ${features_file_swift_src} -p \"\" -f ${features_file_clang_src} -p clang- ${features_file_dest}
16+
${CMAKE_COMMAND} -E copy ${features_file_src} ${features_file_dest}
1917
DEPENDS
20-
${features_merger}
21-
${features_file_swift_src}
22-
${features_file_clang_src}
18+
${features_file_src}
2319
)
2420

2521
add_custom_target(swift-features-file DEPENDS ${features_file_dest})

utils/merge-features.py

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)