[libcxx-commits] [libcxx] e1ca7a6 - [libc++] Fix building the benchmarks after introducing a target for cxx-headers

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-07-14T11:50:12-04:00
New Revision: e1ca7a652222699d3f72cd3115ca269c1040c66e

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

LOG: [libc++] Fix building the benchmarks after introducing a target for cxx-headers

The libc++ headers were included twice, which broke the #include_next
logic.

Added: 
    

Modified: 
    libcxx/benchmarks/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt
index f012cccb696e..8480ede23a49 100644
--- a/libcxx/benchmarks/CMakeLists.txt
+++ b/libcxx/benchmarks/CMakeLists.txt
@@ -87,8 +87,6 @@ set(BENCHMARK_TEST_COMPILE_FLAGS
     -I${LIBCXX_SOURCE_DIR}/test/support
 )
 set(BENCHMARK_TEST_LIBCXX_COMPILE_FLAGS
-    -nostdinc++
-    -isystem ${LIBCXX_SOURCE_DIR}/include
     ${BENCHMARK_TEST_COMPILE_FLAGS}
     ${SANITIZER_FLAGS}
     -Wno-user-defined-literals
@@ -130,7 +128,7 @@ function(add_benchmark_test name source_file)
   set(libcxx_target ${name}_libcxx)
   list(APPEND libcxx_benchmark_targets ${libcxx_target})
   add_executable(${libcxx_target} EXCLUDE_FROM_ALL ${source_file})
-  add_dependencies(${libcxx_target} cxx cxx-headers google-benchmark-libcxx)
+  add_dependencies(${libcxx_target} cxx google-benchmark-libcxx)
   add_dependencies(cxx-benchmarks ${libcxx_target})
   if (LIBCXX_ENABLE_SHARED)
     target_link_libraries(${libcxx_target} PRIVATE cxx_shared)