From: Peter Wu Date: Fri, 4 May 2018 13:43:06 +0000 (+0200) Subject: [PATCH] [llvm] cmake: resolve symlinks in LLVMConfig.cmake X-Git-Tag: archive/raspbian/1%10.0.1-8+rpi1^2^2~62 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=39b912b2225cc78dacdd1ef23a04850c1ad996ad;p=llvm-toolchain-10.git [PATCH] [llvm] cmake: resolve symlinks in LLVMConfig.cmake Ensure that symlinks such as /usr/lib/llvm-X.Y/cmake (pointing to lib/cmake/llvm) are resolved. This ensures that LLVM_INSTALL_PREFIX becomes /usr/lib/llvm-X.Y instead of /usr. Partially addresses PR37128 Gbp-Pq: Name 0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch --- diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt index af757d619..9d444dce3 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/cmake/modules/CMakeLists.txt @@ -88,10 +88,10 @@ file(COPY . # Generate LLVMConfig.cmake for the install tree. set(LLVM_CONFIG_CODE " # Compute the installation prefix from this LLVMConfig.cmake file location. -get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") +get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" REALPATH)") # Construct the proper number of get_filename_component(... PATH) # calls to compute the installation prefix. -string(REGEX REPLACE "/" ";" _count "${LLVM_INSTALL_PACKAGE_DIR}") +string(REGEX REPLACE "/" ";" _count "prefix/${LLVM_INSTALL_PACKAGE_DIR}") foreach(p ${_count}) set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)")