diff options
| -rw-r--r-- | compiler-rt/lib/asan/tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | compiler-rt/test/asan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/test/sanitizer_common/CMakeLists.txt | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt index fed18c6e339..58d9761e2ee 100644 --- a/compiler-rt/lib/asan/tests/CMakeLists.txt +++ b/compiler-rt/lib/asan/tests/CMakeLists.txt @@ -116,9 +116,6 @@ macro(asan_compile obj_list source arch kind) get_filename_component(basename ${source} NAME) set(output_obj "${obj_list}.${basename}.${arch}${kind}.o") get_target_flags_for_arch(${arch} TARGET_CFLAGS) - if(APPLE) - set(TARGET_CFLAGS ${DARWIN_osx_CFLAGS} -arch ${arch}) - endif() set(COMPILE_DEPS ${ASAN_UNITTEST_HEADERS} ${ASAN_BLACKLIST_FILE}) if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND COMPILE_DEPS gtest asan) diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt index 7094ab1b49e..b2be9572002 100644 --- a/compiler-rt/test/asan/CMakeLists.txt +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -42,7 +42,7 @@ foreach(arch ${ASAN_TEST_ARCH}) # Build all tests with host compiler and use host tools. set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) set(ASAN_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS}) - elseif(NOT APPLE) + else() get_target_flags_for_arch(${arch} ASAN_TEST_TARGET_CFLAGS) string(REPLACE ";" " " ASAN_TEST_TARGET_CFLAGS "${ASAN_TEST_TARGET_CFLAGS}") endif() diff --git a/compiler-rt/test/sanitizer_common/CMakeLists.txt b/compiler-rt/test/sanitizer_common/CMakeLists.txt index 801283ef0ce..54b9135278c 100644 --- a/compiler-rt/test/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/test/sanitizer_common/CMakeLists.txt @@ -31,7 +31,7 @@ foreach(tool ${SUPPORTED_TOOLS}) # This is only true if we're cross-compiling. set(SANITIZER_COMMON_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS}) - elseif(NOT APPLE) + else() get_target_flags_for_arch(${arch} SANITIZER_COMMON_TEST_TARGET_CFLAGS) string(REPLACE ";" " " SANITIZER_COMMON_TEST_TARGET_CFLAGS "${SANITIZER_COMMON_TEST_TARGET_CFLAGS}") endif() |
