[CMake] Support runtimes and monorepo layouts when looking for libcxx
This also slightly refactors the code that's checking the directory presence which allows eliminating one unnecessary variable. Differential Revision: https://reviews.llvm.org/D40637 llvm-svn: 320446
This commit is contained in:
parent
2ffea93c57
commit
95d7a4197a
|
@ -344,17 +344,15 @@ endif()
|
|||
|
||||
add_subdirectory(include)
|
||||
|
||||
set(COMPILER_RT_LIBCXX_PATH ${LLVM_MAIN_SRC_DIR}/projects/libcxx)
|
||||
if(EXISTS ${COMPILER_RT_LIBCXX_PATH}/)
|
||||
set(COMPILER_RT_HAS_LIBCXX_SOURCES TRUE)
|
||||
else()
|
||||
set(COMPILER_RT_LIBCXX_PATH ${LLVM_MAIN_SRC_DIR}/../libcxx)
|
||||
if(EXISTS ${COMPILER_RT_LIBCXX_PATH}/)
|
||||
set(COMPILER_RT_HAS_LIBCXX_SOURCES TRUE)
|
||||
else()
|
||||
set(COMPILER_RT_HAS_LIBCXX_SOURCES FALSE)
|
||||
foreach(path IN ITEMS ${LLVM_MAIN_SRC_DIR}/projects/libcxx
|
||||
${LLVM_MAIN_SRC_DIR}/runtimes/libcxx
|
||||
${LLVM_MAIN_SRC_DIR}/../libcxx
|
||||
${LLVM_EXTERNAL_LIBCXX_SOURCE_DIR})
|
||||
if(IS_DIRECTORY ${path})
|
||||
set(COMPILER_RT_LIBCXX_PATH ${path})
|
||||
break()
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/tools/lld)
|
||||
if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD)
|
||||
|
|
|
@ -465,7 +465,7 @@ endmacro(add_compiler_rt_script src name)
|
|||
# DEPS <list of build deps>
|
||||
# CFLAGS <list of compile flags>)
|
||||
macro(add_custom_libcxx name prefix)
|
||||
if(NOT COMPILER_RT_HAS_LIBCXX_SOURCES)
|
||||
if(NOT COMPILER_RT_LIBCXX_PATH)
|
||||
message(FATAL_ERROR "libcxx not found!")
|
||||
endif()
|
||||
|
||||
|
|
|
@ -122,7 +122,7 @@ macro(add_msan_tests_for_arch arch kind cflags)
|
|||
endmacro()
|
||||
|
||||
# We should only build MSan unit tests if we can build instrumented libcxx.
|
||||
if(COMPILER_RT_CAN_EXECUTE_TESTS AND COMPILER_RT_HAS_LIBCXX_SOURCES)
|
||||
if(COMPILER_RT_CAN_EXECUTE_TESTS AND COMPILER_RT_LIBCXX_PATH)
|
||||
foreach(arch ${MSAN_SUPPORTED_ARCH})
|
||||
get_target_flags_for_arch(${arch} TARGET_CFLAGS)
|
||||
set(LIBCXX_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/../libcxx_msan_${arch})
|
||||
|
|
|
@ -203,7 +203,7 @@ if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
|||
endif()
|
||||
|
||||
# Build libcxx instrumented with TSan.
|
||||
if(COMPILER_RT_HAS_LIBCXX_SOURCES AND
|
||||
if(COMPILER_RT_LIBCXX_PATH AND
|
||||
COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang" AND
|
||||
NOT ANDROID)
|
||||
set(libcxx_tsan_deps)
|
||||
|
|
|
@ -25,7 +25,7 @@ if(NOT COMPILER_RT_STANDALONE_BUILD)
|
|||
list(APPEND MSAN_TEST_DEPS msan)
|
||||
endif()
|
||||
|
||||
if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_LIBCXX_SOURCES)
|
||||
if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_LIBCXX_PATH)
|
||||
configure_lit_site_cfg(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg)
|
||||
|
|
|
@ -7,7 +7,7 @@ endif()
|
|||
if(NOT COMPILER_RT_STANDALONE_BUILD)
|
||||
list(APPEND TSAN_TEST_DEPS tsan)
|
||||
endif()
|
||||
if(COMPILER_RT_HAS_LIBCXX_SOURCES AND
|
||||
if(COMPILER_RT_LIBCXX_PATH AND
|
||||
COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang"
|
||||
AND NOT APPLE AND NOT ANDROID)
|
||||
list(APPEND TSAN_TEST_DEPS libcxx_tsan)
|
||||
|
|
Loading…
Reference in New Issue