[compiler-rt] r245582 - [CMake] Fixing r245581 based on feedback from Filcab.

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Thu Aug 20 12:46:58 2015
New Revision: 245582

URL: http://llvm.org/viewvc/llvm-project?rev=245582&view=rev
Log:
[CMake] Fixing r245581 based on feedback from Filcab.

Modified:
    compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
    compiler-rt/trunk/test/asan/CMakeLists.txt
    compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt

Modified: compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=245582&r1=245581&r2=245582&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Thu Aug 20 12:46:58 2015
@@ -116,9 +116,6 @@ macro(asan_compile obj_list source arch
   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)

Modified: compiler-rt/trunk/test/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/CMakeLists.txt?rev=245582&r1=245581&r2=245582&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/asan/CMakeLists.txt Thu Aug 20 12:46:58 2015
@@ -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()

Modified: compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt?rev=245582&r1=245581&r2=245582&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/sanitizer_common/CMakeLists.txt Thu Aug 20 12:46:58 2015
@@ -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()