maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CMake] Fixing r245581 based on feedback from Filcab. 

llvm-svn: 245582
This commit is contained in:
Chris Bieneman 2015-08-20 17:46:58 +00:00
parent 73107c6122
commit 2335bb7e16
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler-rt/lib/asan/tests/CMakeLists.txt
View File

@ -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)

2
compiler-rt/test/asan/CMakeLists.txt
View File

@ -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()

2
compiler-rt/test/sanitizer_common/CMakeLists.txt
View File

@ -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()