summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2014-03-19 14:45:40 +0000
committerAlexey Samsonov <samsonov@google.com>2014-03-19 14:45:40 +0000
commit8227a4a42e578a458b9cd47ea54d07779b60fe17 (patch)
tree9a4153da9030b5716e2456c498efc855a3ac8ef8
parent5063812ec5fcb2e71ade4c1de361c87547dfeddd (diff)
[CMake] Fix build of ASan tests on Mac
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@204238 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/asan/tests/CMakeLists.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/asan/tests/CMakeLists.txt b/lib/asan/tests/CMakeLists.txt
index b33653d55..03a78f5f5 100644
--- a/lib/asan/tests/CMakeLists.txt
+++ b/lib/asan/tests/CMakeLists.txt
@@ -30,7 +30,6 @@ set(ASAN_UNITTEST_COMMON_CFLAGS
-Wno-format
-Werror
-Werror=sign-compare
- -std=c++11
-g
-O2)
append_if(COMPILER_RT_HAS_WNO_VARIADIC_MACROS_FLAG -Wno-variadic-macros ASAN_UNITTEST_COMMON_CFLAGS)
@@ -147,7 +146,7 @@ macro(add_asan_tests_for_arch arch)
set(ASAN_INST_TEST_OBJECTS)
foreach(src ${ASAN_INST_TEST_SOURCES})
asan_compile(ASAN_INST_TEST_OBJECTS ${src} ${arch}
- ${ASAN_UNITTEST_INSTRUMENTED_CFLAGS})
+ ${ASAN_UNITTEST_INSTRUMENTED_CFLAGS} -std=c++11)
endforeach()
if (APPLE)
# Add Mac-specific helper.
@@ -181,7 +180,7 @@ macro(add_asan_tests_for_arch arch)
set(ASAN_NOINST_TEST_OBJECTS)
foreach(src ${ASAN_NOINST_TEST_SOURCES})
asan_compile(ASAN_NOINST_TEST_OBJECTS ${src} ${arch}
- ${ASAN_UNITTEST_COMMON_CFLAGS})
+ ${ASAN_UNITTEST_COMMON_CFLAGS} -std=c++11)
endforeach()
add_asan_test(AsanUnitTests "Asan-${arch}-Noinst-Test" ${arch}
OBJECTS ${ASAN_NOINST_TEST_OBJECTS}
@@ -192,7 +191,7 @@ macro(add_asan_tests_for_arch arch)
set(ASAN_BENCHMARKS_OBJECTS)
foreach(src ${ASAN_BENCHMARKS_SOURCES})
asan_compile(ASAN_BENCHMARKS_OBJECTS ${src} ${arch}
- ${ASAN_UNITTEST_INSTRUMENTED_CFLAGS})
+ ${ASAN_UNITTEST_INSTRUMENTED_CFLAGS} -std=c++11)
endforeach()
add_asan_test(AsanBenchmarks "Asan-${arch}-Benchmark" ${arch}
OBJECTS ${ASAN_BENCHMARKS_OBJECTS}