Author: stefan.graenitz Date: Fri Feb 1 07:35:25 2019 New Revision: 352881
URL: http://llvm.org/viewvc/llvm-project?rev=352881&view=rev Log: [CMake] External compiler-rt-configure requires LLVMTestingSupport when including tests Summary: Apparently `LLVMTestingSupport` must be built before `llvm-config` can be asked for it. Symptom with `LLVM_INCLUDE_TESTS=ON` is: ``` $ ./path/to/llvm-build/bin/llvm-config --ldflags --libs testingsupport -L/path/to/llvm-build/lib -Wl,-search_paths_first -Wl,-headerpad_max_install_names llvm-config: error: component libraries and shared library llvm-config: error: missing: /path/to/llvm-build/lib/libLLVMTestingSupport.a ``` With `LLVMTestingSupport` as dependency of `compiler-rt-configure` we get the expected behavior: ``` $ ./path/to/llvm-build/bin/llvm-config --ldflags --libs testingsupport -L/path/to/llvm-build/lib -Wl,-search_paths_first -Wl,-headerpad_max_install_names -lLLVMTestingSupport -lLLVMSupport -lLLVMDemangle ``` Reviewers: ab, beanz Subscribers: dberris, mgorny, erik.pilkington, llvm-commits, cfe-commits Differential Revision: https://reviews.llvm.org/D57521 Modified: cfe/trunk/runtime/CMakeLists.txt Modified: cfe/trunk/runtime/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/CMakeLists.txt?rev=352881&r1=352880&r2=352881&view=diff ============================================================================== --- cfe/trunk/runtime/CMakeLists.txt (original) +++ cfe/trunk/runtime/CMakeLists.txt Fri Feb 1 07:35:25 2019 @@ -58,12 +58,16 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND E endif() endforeach() + set(compiler_rt_configure_deps) if(TARGET cxx-headers) - set(COMPILER_RT_LIBCXX_DEPENDENCY "cxx-headers") + list(APPEND compiler_rt_configure_deps "cxx-headers") + endif() + if(LLVM_INCLUDE_TESTS) + list(APPEND compiler_rt_configure_deps LLVMTestingSupport) endif() ExternalProject_Add(compiler-rt - DEPENDS llvm-config clang ${COMPILER_RT_LIBCXX_DEPENDENCY} + DEPENDS llvm-config clang ${compiler_rt_configure_deps} PREFIX ${COMPILER_RT_PREFIX} SOURCE_DIR ${COMPILER_RT_SRC_ROOT} STAMP_DIR ${STAMP_DIR} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
