Skip to content

Commit b207a17

Browse files
committed
Revert "[Runtimes] Merge 'compile_commands.json' files from runtimes build (#116303)"
This reverts commit 054f914, which was found to break the runtimes build.
1 parent 4e8eabd commit b207a17

File tree

2 files changed

+0
-66
lines changed

2 files changed

+0
-66
lines changed

llvm/utils/merge-json.py

-48
This file was deleted.

runtimes/CMakeLists.txt

-18
Original file line numberDiff line numberDiff line change
@@ -346,21 +346,3 @@ if(SUB_COMPONENTS)
346346
${CMAKE_CURRENT_BINARY_DIR}/runtimes/Components.cmake)
347347
endif()
348348
endif()
349-
350-
# If the user requested 'compile_commands.json' we merge the generated JSON from
351-
# the created directories.
352-
if(CMAKE_EXPORT_COMPILE_COMMANDS)
353-
# Make a dependency so that we don't error if the file gets deleted somehow.
354-
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/compile_commands.json
355-
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/compile_commands.json)
356-
357-
file(TO_NATIVE_PATH "${LLVM_MAIN_SRC_DIR}/utils/merge-json.py" MERGE_JSON_PATH)
358-
add_custom_command(OUTPUT ${LLVM_BINARY_DIR}/compile_commands.json
359-
COMMAND ${CMAKE_COMMAND} -E touch ${LLVM_BINARY_DIR}/compile_commands.json
360-
COMMAND ${Python3_EXECUTABLE} ${MERGE_JSON_PATH}
361-
${LLVM_BINARY_DIR}/compile_commands.json
362-
${CMAKE_BINARY_DIR}/compile_commands.json
363-
-o ${LLVM_BINARY_DIR}/compile_commands.json
364-
DEPENDS ${CMAKE_BINARY_DIR}/compile_commands.json)
365-
add_custom_target(merge_runtime_commands ALL DEPENDS ${LLVM_BINARY_DIR}/compile_commands.json)
366-
endif()

0 commit comments

Comments
 (0)