Skip to content

Commit 0ec24e1

Browse files
committed
Only use major version in the clang resource directory for standalone builds.
Commit e1b88c8 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.
1 parent 6eaedbb commit 0ec24e1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lldb/cmake/modules/LLDBConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ endif()
271271
# directory that LLDB is using for its embedded Clang instance needs to point
272272
# to the resource directory of the used Clang installation.
273273
if (NOT TARGET clang-resource-headers)
274-
set(LLDB_CLANG_RESOURCE_DIR_NAME "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
274+
set(LLDB_CLANG_RESOURCE_DIR_NAME "${LLVM_VERSION_MAJOR}")
275275
# Iterate over the possible places where the external resource directory
276276
# could be and pick the first that exists.
277277
foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}"

0 commit comments

Comments
 (0)