Author: Jim Ingham Date: 2022-11-16T16:00:26-08:00 New Revision: 0ec24e1f956616c54f38e104b482dec9309a93fa
URL: https://github.com/llvm/llvm-project/commit/0ec24e1f956616c54f38e104b482dec9309a93fa DIFF: https://github.com/llvm/llvm-project/commit/0ec24e1f956616c54f38e104b482dec9309a93fa.diff LOG: Only use major version in the clang resource directory for standalone builds. Commit e1b88c8a09be changed the name of the clang resource directory so that it was "lib/clang/<MajorVersion>" but missed the place in the LLDB standalone build where we search for the resource directory. That was still looking for <Major>.<Minor>.<Patch>. The standalone lldb bot has been failing since this commit. Added: Modified: lldb/cmake/modules/LLDBConfig.cmake Removed: ################################################################################ diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake index 2dd14d05a92aa..1079e4b2def17 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake @@ -271,7 +271,7 @@ endif() # directory that LLDB is using for its embedded Clang instance needs to point # to the resource directory of the used Clang installation. if (NOT TARGET clang-resource-headers) - set(LLDB_CLANG_RESOURCE_DIR_NAME "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}") + set(LLDB_CLANG_RESOURCE_DIR_NAME "${LLVM_VERSION_MAJOR}") # Iterate over the possible places where the external resource directory # could be and pick the first that exists. foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits