[compiler-rt] r357657 - [TSan][libdispatch] Add Cmake option for libdispatch install path

[Julian Lettner via llvm-commits]

Author: yln
Date: Wed Apr  3 17:28:09 2019
New Revision: 357657

URL: http://llvm.org/viewvc/llvm-project?rev=357657&view=rev
Log:
[TSan][libdispatch] Add Cmake option for libdispatch install path

Modified:
    compiler-rt/trunk/CMakeLists.txt

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Wed Apr  3 17:28:09 2019
@@ -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()