diff options
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/CMakeLists.txt | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index d7947f451b1..c6769e4b797 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -186,14 +186,14 @@ option(COMPILER_RT_INTERCEPT_LIBDISPATCH 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) + set(COMPILER_RT_LIBDISPATCH_CFLAGS -fblocks) + set(COMPILER_RT_TEST_LIBDISPATCH_CFLAGS) if (COMPILER_RT_LIBDISPATCH_INSTALL_PREFIX) - list(APPEND COMPILER_RT_INTERCEPT_LIBDISPATCH_LINK_FLAGS + list(APPEND COMPILER_RT_TEST_LIBDISPATCH_CFLAGS -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) + list(APPEND COMPILER_RT_TEST_LIBDISPATCH_CFLAGS -lBlocksRuntime -ldispatch) endif() if (APPLE) # Always enable on Apple platforms. set(COMPILER_RT_INTERCEPT_LIBDISPATCH ON) diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index a8a9c75a4d8..43dbe864416 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -72,7 +72,7 @@ endif() if(COMPILER_RT_INTERCEPT_LIBDISPATCH) list(APPEND TSAN_SOURCES rtl/tsan_libdispatch.cc) - list(APPEND TSAN_RTL_CFLAGS ${COMPILER_RT_INTERCEPT_LIBDISPATCH_CFLAGS}) + list(APPEND TSAN_RTL_CFLAGS ${COMPILER_RT_LIBDISPATCH_CFLAGS}) endif() set(TSAN_HEADERS diff --git a/compiler-rt/lib/tsan/tests/CMakeLists.txt b/compiler-rt/lib/tsan/tests/CMakeLists.txt index 43460eab229..3bf02ed5d61 100644 --- a/compiler-rt/lib/tsan/tests/CMakeLists.txt +++ b/compiler-rt/lib/tsan/tests/CMakeLists.txt @@ -45,7 +45,7 @@ if(APPLE) else() list(APPEND LINK_FLAGS -fsanitize=thread) list(APPEND LINK_FLAGS -lm) - list(APPEND LINK_FLAGS ${COMPILER_RT_INTERCEPT_LIBDISPATCH_LINK_FLAGS}) + list(APPEND LINK_FLAGS ${COMPILER_RT_TEST_LIBDISPATCH_CFLAGS}) endif() set(TSAN_RTL_HEADERS) diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index f635e80c4eb..c62eb1d6b3d 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -31,8 +31,8 @@ foreach(arch ${TSAN_TEST_ARCH}) string(TOLOWER "-${arch}" TSAN_TEST_CONFIG_SUFFIX) get_test_cc_for_arch(${arch} TSAN_TEST_TARGET_CC TSAN_TEST_TARGET_CFLAGS) - string(REPLACE ";" " " LIBDISPATCH_LINK_FLAGS_STRING " ${COMPILER_RT_INTERCEPT_LIBDISPATCH_LINK_FLAGS}") - string(APPEND TSAN_TEST_TARGET_CFLAGS ${LIBDISPATCH_LINK_FLAGS_STRING}) + string(REPLACE ";" " " LIBDISPATCH_CFLAGS_STRING " ${COMPILER_RT_TEST_LIBDISPATCH_CFLAGS}") + string(APPEND TSAN_TEST_TARGET_CFLAGS ${LIBDISPATCH_CFLAGS_STRING}) string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME ${ARCH_UPPER_CASE}Config) |
