diff options
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index e86609df3be..d7947f451b1 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -183,22 +183,15 @@ pythonize_bool(COMPILER_RT_DEBUG) option(COMPILER_RT_INTERCEPT_LIBDISPATCH "Support interception of libdispatch (GCD). Requires '-fblocks'" OFF) -option(COMPILER_RT_BLOCKS_RUNTIME_LIBRARY_PATH - "Library search path for blocks runtime (-lBlocksRuntime)" "") -option(COMPILER_RT_LIBDISPATCH_LIBRARY_PATH - "Library search path for libdispatch (-ldispatch)" "") +option(COMPILER_RT_LIBDISPATCH_INSTALL_PREFIX + "Specify if libdispatch is installed in a non-default path" "") if (COMPILER_RT_INTERCEPT_LIBDISPATCH AND NOT APPLE) set(COMPILER_RT_INTERCEPT_LIBDISPATCH_CFLAGS -fblocks) set(COMPILER_RT_INTERCEPT_LIBDISPATCH_LINK_FLAGS) - if (COMPILER_RT_BLOCKS_RUNTIME_LIBRARY_PATH) + if (COMPILER_RT_LIBDISPATCH_INSTALL_PREFIX) list(APPEND COMPILER_RT_INTERCEPT_LIBDISPATCH_LINK_FLAGS - -L${COMPILER_RT_BLOCKS_RUNTIME_LIBRARY_PATH} - -Wl,-rpath=${COMPILER_RT_BLOCKS_RUNTIME_LIBRARY_PATH}) - endif() - if (COMPILER_RT_LIBDISPATCH_LIBRARY_PATH) - list(APPEND COMPILER_RT_INTERCEPT_LIBDISPATCH_LINK_FLAGS - -L${COMPILER_RT_LIBDISPATCH_LIBRARY_PATH} - -Wl,-rpath=${COMPILER_RT_LIBDISPATCH_LIBRARY_PATH}) + -L${COMPILER_RT_LIBDISPATCH_INSTALL_PREFIX}/lib + -Wl,-rpath=${COMPILER_RT_LIBDISPATCH_INSTALL_PREFIX}/lib) endif() list(APPEND COMPILER_RT_INTERCEPT_LIBDISPATCH_LINK_FLAGS -lBlocksRuntime -ldispatch) endif() |
