llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Adrian Prantl (adrian-prantl) <details> <summary>Changes</summary> Address post-commit feedback on https://github.com/llvm/llvm-project/commit/8ad0f7cf78f12b51e91d3799593a1d766b6ab6a6. --- Full diff: https://github.com/llvm/llvm-project/pull/216398.diff 1 Files Affected: - (modified) lldb/source/API/CMakeLists.txt (+6-5) ``````````diff diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt index 83ecb428d8ea4..f7604b8f9cf73 100644 --- a/lldb/source/API/CMakeLists.txt +++ b/lldb/source/API/CMakeLists.txt @@ -284,8 +284,6 @@ set(generated_public_headers ${LLDB_OBJ_DIR}/include/lldb/API/SBLanguages.h) file(GLOB root_public_headers ${LLDB_SOURCE_DIR}/include/lldb/lldb-*.h) file(GLOB root_private_headers ${LLDB_SOURCE_DIR}/include/lldb/lldb-private*.h) list(REMOVE_ITEM root_public_headers ${root_private_headers}) -# Skip the initial copy of lldb-defines.h. The fixed version is generated at build time. -list(REMOVE_ITEM root_public_headers ${LLDB_SOURCE_DIR}/include/lldb/lldb-defines.h) add_custom_command( OUTPUT ${lldb_header_staging_dir} @@ -311,6 +309,12 @@ foreach(header get_filename_component(basename ${header} NAME) set(staged_header ${lldb_header_staging_dir}/${basename}) + if(basename STREQUAL "lldb-defines.h") + set(copy_command "${Python3_EXECUTABLE}" + ${LLDB_SOURCE_DIR}/scripts/version-header-fix.py + -i ${header} -o ${staged_header} + -m ${LLDB_VERSION_MAJOR} -n ${LLDB_VERSION_MINOR} -p ${LLDB_VERSION_PATCH}) + endif() if(unifdef_EXECUTABLE) # unifdef returns 0 when the file is unchanged and 1 if something was changed. # That means if we successfully remove SWIG code, the build system believes @@ -345,9 +349,6 @@ foreach(header endif() endforeach() -add_custom_command(TARGET liblldb-header-staging POST_BUILD - COMMAND "${Python3_EXECUTABLE}" ${LLDB_SOURCE_DIR}/scripts/version-header-fix.py -i ${LLDB_SOURCE_DIR}/include/lldb/lldb-defines.h -o ${lldb_header_staging_dir}/lldb-defines.h -m ${LLDB_VERSION_MAJOR} -n ${LLDB_VERSION_MINOR} -p ${LLDB_VERSION_PATCH} -) add_dependencies(liblldb liblldb-header-staging) if(LLDB_BUILD_FRAMEWORK) `````````` </details> https://github.com/llvm/llvm-project/pull/216398 _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
