[libcxx-commits] [libcxx] 2827023 - [libc++] Fix the benchmarks build

Louis Dionne via libcxx-commits libcxx-commits at lists.llvm.org
Wed Oct 21 14:57:37 PDT 2020


Author: Louis Dionne
Date: 2020-10-21T17:55:35-04:00
New Revision: 28270234f1478047e35879f4ba8838b47edfcc14

URL: https://github.com/llvm/llvm-project/commit/28270234f1478047e35879f4ba8838b47edfcc14
DIFF: https://github.com/llvm/llvm-project/commit/28270234f1478047e35879f4ba8838b47edfcc14.diff

LOG: [libc++] Fix the benchmarks build

Added: 
    

Modified: 
    libcxx/benchmarks/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt
index 42d25c20c811..12acffcbc98b 100644
--- a/libcxx/benchmarks/CMakeLists.txt
+++ b/libcxx/benchmarks/CMakeLists.txt
@@ -8,7 +8,7 @@ include(CheckCXXCompilerFlag)
 set(BENCHMARK_LIBCXX_COMPILE_FLAGS
     -Wno-unused-command-line-argument
     -nostdinc++
-    -isystem ${LIBCXX_SOURCE_DIR}/include
+    -isystem "${LIBCXX_GENERATED_INCLUDE_DIR}"
     -L${LIBCXX_LIBRARY_DIR}
     -Wl,-rpath,${LIBCXX_LIBRARY_DIR}
     ${SANITIZER_FLAGS}
@@ -18,7 +18,6 @@ if (DEFINED LIBCXX_CXX_ABI_LIBRARY_PATH)
           -L${LIBCXX_CXX_ABI_LIBRARY_PATH}
           -Wl,-rpath,${LIBCXX_CXX_ABI_LIBRARY_PATH})
 endif()
-list(APPEND BENCHMARK_LIBCXX_COMPILE_FLAGS -include "${LIBCXX_BINARY_DIR}/__config_site")
 split_list(BENCHMARK_LIBCXX_COMPILE_FLAGS)
 
 ExternalProject_Add(google-benchmark-libcxx


        


More information about the libcxx-commits mailing list