···11+diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake22+index 37364341ff8b..7f74c1a3e257 10064433+--- a/cmake/modules/LLDBConfig.cmake44++++ b/cmake/modules/LLDBConfig.cmake55+@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers)66+ # Iterate over the possible places where the external resource directory77+ # could be and pick the first that exists.88+ foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}"99+- "${LLVM_BUILD_LIBRARY_DIR}"1010++ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@"1111+ "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")1212+ # Build the resource directory path by appending 'clang/<version number>'.1313+ set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}")
···11+diff --git a/CMakeLists.txt b/CMakeLists.txt22+index b6ddbe90516d..311ab1d50e7f 10064433+--- a/CMakeLists.txt44++++ b/CMakeLists.txt55+@@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD)66+ set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING77+ "Suffix of lib installation directory, e.g. 64 => lib64")88+ # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.99+- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")1010++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")1111+1212+ # Group test settings.1313+ set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING1414+@@ -40,7 +40,7 @@ if (OPENMP_STANDALONE_BUILD)1515+ else()1616+ set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})1717+ # If building in tree, we honor the same install suffix LLVM uses.1818+- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")1919++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")2020+2121+ if (NOT MSVC)2222+ set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)