summaryrefslogtreecommitdiffstats
path: root/libcxx/benchmarks
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-08-02 20:21:07 +0000
committerEric Fiselier <eric@efcs.ca>2016-08-02 20:21:07 +0000
commit84c557ad3ec0b020e511d0f1792b68b71e815d8a (patch)
treecd30d4c949720aae9809a034cb21113281575981 /libcxx/benchmarks
parenteb09609f395d025e23482e22594acfa6fab88083 (diff)
downloadbcm5719-llvm-84c557ad3ec0b020e511d0f1792b68b71e815d8a.tar.gz
bcm5719-llvm-84c557ad3ec0b020e511d0f1792b68b71e815d8a.zip
Pass compilers when configuring Google Benchmark.
llvm-svn: 277512
Diffstat (limited to 'libcxx/benchmarks')
-rw-r--r--libcxx/benchmarks/CMakeLists.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt
index e95bfa839ba..1adbf6f96e2 100644
--- a/libcxx/benchmarks/CMakeLists.txt
+++ b/libcxx/benchmarks/CMakeLists.txt
@@ -26,7 +26,9 @@ ExternalProject_Add(google-benchmark-libcxx
PREFIX benchmark-libcxx
SOURCE_DIR ${LIBCXX_SOURCE_DIR}/utils/google-benchmark
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/benchmark-libcxx
- CMAKE_CACHE_DEFAULT_ARGS
+ CMAKE_CACHE_ARGS
+ -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-DCMAKE_BUILD_TYPE:STRING=RELEASE
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_CXX_FLAGS:STRING=${BENCHMARK_LIBCXX_COMPILE_FLAGS}
@@ -45,7 +47,9 @@ if (LIBCXX_BUILD_BENCHMARK_NATIVE_STDLIB)
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/benchmark-native
CMAKE_CACHE_ARGS
-DBENCHMARK_ENABLE_TESTING:BOOL=OFF
- CMAKE_CACHE_DEFAULT_ARGS
+ CMAKE_CACHE_ARGS
+ -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-DCMAKE_BUILD_TYPE:STRING=RELEASE
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>)
endif()
@@ -63,6 +67,7 @@ set(BENCHMARK_TEST_COMPILE_FLAGS
)
set(BENCHMARK_TEST_LIBCXX_COMPILE_FLAGS
-nostdinc++
+ -cxx-isystem ${LIBCXX_SOURCE_DIR}/include
${BENCHMARK_TEST_COMPILE_FLAGS}
-Wno-user-defined-literals
)
OpenPOWER on IntegriCloud