From e7bad34475e2fd72e8a9952ded4bfec68d2d0f5a Mon Sep 17 00:00:00 2001 From: Alexander Richardson Date: Wed, 6 Nov 2024 11:57:47 -0800 Subject: [PATCH] [compiler-rt] Use installed libc++(abi) for tests instead of build tree Using the build tree is somewhat fragile since the layout is not guaranteed to be stable and means the tests are tightly coupled to the libc++/libc++abi build tree layout. Instead update the ExternalProject to install the library and headers and do not add the build tree to the include/linker flags. Pull Request: https://github.com/llvm/llvm-project/pull/115077 --- compiler-rt/cmake/Modules/AddCompilerRT.cmake | 12 +++++++----- compiler-rt/lib/fuzzer/CMakeLists.txt | 6 +++--- compiler-rt/lib/fuzzer/tests/CMakeLists.txt | 2 +- compiler-rt/lib/msan/tests/CMakeLists.txt | 8 ++++---- compiler-rt/lib/tsan/CMakeLists.txt | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index bfa1834229ba..abbeea0c493a 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -680,15 +680,16 @@ macro(add_custom_libcxx name prefix) ExternalProject_Add(${name} DEPENDS ${name}-clobber ${LIBCXX_DEPS} - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/${name} + PREFIX ${prefix} SOURCE_DIR ${LLVM_MAIN_SRC_DIR}/../runtimes - BINARY_DIR ${prefix} + BINARY_DIR ${prefix}/build CMAKE_ARGS ${CMAKE_PASSTHROUGH_VARIABLES} ${compiler_args} ${verbose} -DCMAKE_C_FLAGS=${LIBCXX_C_FLAGS} -DCMAKE_CXX_FLAGS=${LIBCXX_CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release + -DCMAKE_INSTALL_PREFIX= -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY -DLLVM_ENABLE_RUNTIMES=libcxx|libcxxabi -DLIBCXXABI_USE_LLVM_UNWINDER=OFF @@ -701,16 +702,17 @@ macro(add_custom_libcxx name prefix) -DLIBCXX_INCLUDE_BENCHMARKS=OFF -DLIBCXX_INCLUDE_TESTS=OFF -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON + -DLLVM_INCLUDE_TESTS=OFF + -DLLVM_INCLUDE_DOCS=OFF ${LIBCXX_CMAKE_ARGS} - INSTALL_COMMAND "" - STEP_TARGETS configure build + STEP_TARGETS configure build install BUILD_ALWAYS 1 USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 LIST_SEPARATOR | EXCLUDE_FROM_ALL TRUE - BUILD_BYPRODUCTS "${prefix}/lib/libc++.a" "${prefix}/lib/libc++abi.a" + INSTALL_BYPRODUCTS "${prefix}/lib/libc++.a" "${prefix}/lib/libc++abi.a" ) if (CMAKE_GENERATOR MATCHES "Make") diff --git a/compiler-rt/lib/fuzzer/CMakeLists.txt b/compiler-rt/lib/fuzzer/CMakeLists.txt index fb5adf1e5c9e..a6175564e55a 100644 --- a/compiler-rt/lib/fuzzer/CMakeLists.txt +++ b/compiler-rt/lib/fuzzer/CMakeLists.txt @@ -166,11 +166,11 @@ if(OS_NAME MATCHES "Android|Linux|Fuchsia" AND -DLIBCXX_ABI_NAMESPACE=__Fuzzer -DLIBCXX_ENABLE_EXCEPTIONS=OFF) target_compile_options(RTfuzzer.${arch} PRIVATE -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1) - add_dependencies(RTfuzzer.${arch} libcxx_fuzzer_${arch}-build) + add_dependencies(RTfuzzer.${arch} libcxx_fuzzer_${arch}-install) target_compile_options(RTfuzzer_main.${arch} PRIVATE -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1) - add_dependencies(RTfuzzer_main.${arch} libcxx_fuzzer_${arch}-build) + add_dependencies(RTfuzzer_main.${arch} libcxx_fuzzer_${arch}-install) target_compile_options(RTfuzzer_interceptors.${arch} PRIVATE -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1) - add_dependencies(RTfuzzer_interceptors.${arch} libcxx_fuzzer_${arch}-build) + add_dependencies(RTfuzzer_interceptors.${arch} libcxx_fuzzer_${arch}-install) partially_link_libcxx(fuzzer_no_main ${LIBCXX_${arch}_PREFIX} ${arch}) partially_link_libcxx(fuzzer_interceptors ${LIBCXX_${arch}_PREFIX} ${arch}) partially_link_libcxx(fuzzer ${LIBCXX_${arch}_PREFIX} ${arch}) diff --git a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt index 5086c0334b22..73ebc1353120 100644 --- a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt +++ b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt @@ -64,7 +64,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH) COMPILER_RT_LIBCXX_PATH AND COMPILER_RT_LIBCXXABI_PATH) file(GLOB libfuzzer_headers ../*.h) - set(LIBFUZZER_TEST_RUNTIME_DEPS libcxx_fuzzer_${arch}-build ${libfuzzer_headers}) + set(LIBFUZZER_TEST_RUNTIME_DEPS libcxx_fuzzer_${arch}-install ${libfuzzer_headers}) set(LIBFUZZER_TEST_RUNTIME_CFLAGS -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1) set(LIBFUZZER_TEST_RUNTIME_LINK_FLAGS ${LIBCXX_${arch}_PREFIX}/lib/libc++.a) endif() diff --git a/compiler-rt/lib/msan/tests/CMakeLists.txt b/compiler-rt/lib/msan/tests/CMakeLists.txt index e0771dd5a1a7..3ddae6d08b7f 100644 --- a/compiler-rt/lib/msan/tests/CMakeLists.txt +++ b/compiler-rt/lib/msan/tests/CMakeLists.txt @@ -69,7 +69,7 @@ macro(msan_compile obj_list source arch kind cflags) sanitizer_test_compile( ${obj_list} ${source} ${arch} KIND ${kind} - COMPILE_DEPS ${MSAN_UNITTEST_HEADERS} libcxx_msan_${arch}-build + COMPILE_DEPS ${MSAN_UNITTEST_HEADERS} libcxx_msan_${arch}-install DEPS msan CFLAGS -isystem ${MSAN_LIBCXX_DIR}/../include/c++/v1 ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${cflags} @@ -117,10 +117,10 @@ macro(add_msan_tests_for_arch arch kind cflags) DEPS ${MSAN_INST_LOADABLE_OBJECTS}) set(MSAN_TEST_OBJECTS ${MSAN_INST_TEST_OBJECTS} ${MSAN_INST_GTEST}) - set(MSAN_TEST_DEPS ${MSAN_TEST_OBJECTS} libcxx_msan_${arch}-build + set(MSAN_TEST_DEPS ${MSAN_TEST_OBJECTS} libcxx_msan_${arch}-install ${MSAN_LOADABLE_SO} - "${MSAN_LIBCXX_DIR}/libc++.a" "${MSAN_LIBCXX_DIR}/libc++abi.a") - list(APPEND MSAN_TEST_DEPS msan libcxx_msan_${arch}-build) + "${MSAN_LIBCXX_DIR}/libc++.a" "${MSAN_LIBCXX_DIR}/libc++abi.a") + list(APPEND MSAN_TEST_DEPS msan libcxx_msan_${arch}-install) get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS) add_compiler_rt_test(MsanUnitTests "Msan-${arch}${kind}-Test" ${arch} OBJECTS ${MSAN_TEST_OBJECTS} "${MSAN_LIBCXX_DIR}/libc++.a" "${MSAN_LIBCXX_DIR}/libc++abi.a" diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index e192506f0c93..f7e2b5b6a356 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -31,7 +31,7 @@ if(COMPILER_RT_LIBCXX_PATH AND DEPS ${TSAN_RUNTIME_LIBRARIES} CFLAGS ${TARGET_CFLAGS} -fsanitize=thread USE_TOOLCHAIN) - list(APPEND libcxx_tsan_deps libcxx_tsan_${arch}-build) + list(APPEND libcxx_tsan_deps libcxx_tsan_${arch}-install) endforeach() add_custom_target(libcxx_tsan DEPENDS ${libcxx_tsan_deps})