Index: llvm/cmake/modules/CMakeLists.txt =================================================================== --- llvm/cmake/modules/CMakeLists.txt +++ llvm/cmake/modules/CMakeLists.txt @@ -47,6 +47,12 @@ set(LLVM_CONFIG_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(LLVM_CONFIG_BINARY_DIR "${LLVM_BINARY_DIR}") set(LLVM_CONFIG_TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}") + +if (LLVM_LINK_LLVM_DYLIB) + set(LLVM_CONFIG_LINK_LLVM_DYLIB + "set(LLVM_LINK_LLVM_DYLIB ${LLVM_LINK_LLVM_DYLIB})") +endif() + # We need to use the full path to the LLVM Exports file to make sure we get the # one from the build tree. This is due to our cmake files being split between # this source dir and the binary dir in the build tree configuration and the Index: llvm/cmake/modules/LLVMConfig.cmake.in =================================================================== --- llvm/cmake/modules/LLVMConfig.cmake.in +++ llvm/cmake/modules/LLVMConfig.cmake.in @@ -13,7 +13,7 @@ set(LLVM_AVAILABLE_LIBS @LLVM_AVAILABLE_LIBS@) -set(LLVM_LINK_LLVM_DYLIB @LLVM_LINK_LLVM_DYLIB@) +@LLVM_CONFIG_LINK_LLVM_DYLIB@ set(LLVM_DYLIB_COMPONENTS @LLVM_DYLIB_COMPONENTS@)