diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -753,8 +753,11 @@ setup_dependency_debugging(${name} ${LLVM_COMMON_DEPENDS}) - if(NOT ARG_NO_INSTALL_RPATH) - llvm_setup_rpath(${name}) + if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB) + set(USE_SHARED USE_SHARED) + if(NOT ARG_NO_INSTALL_RPATH) + llvm_setup_rpath(${name}) + endif() endif() if(DEFINED windows_resource_file) @@ -777,10 +780,6 @@ add_llvm_symbol_exports( ${name} ${LLVM_EXPORTED_SYMBOL_FILE} ) endif(LLVM_EXPORTED_SYMBOL_FILE) - if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB) - set(USE_SHARED USE_SHARED) - endif() - set(EXCLUDE_FROM_ALL OFF) set_output_directory(${name} BINARY_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR} LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) llvm_config( ${name} ${USE_SHARED} ${LLVM_LINK_COMPONENTS} )