diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-11-14 00:09:26 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-11-14 00:09:26 +0000 |
| commit | 2d2e23e89b83ce9c7c2fec011abe16da74711b54 (patch) | |
| tree | 80d2f879ec682c106d207079b54e66461e2e6f6c | |
| parent | 6f01cd07e411606b10aa251dca5ab47f7dc36a93 (diff) | |
| download | bcm5719-llvm-2d2e23e89b83ce9c7c2fec011abe16da74711b54.tar.gz bcm5719-llvm-2d2e23e89b83ce9c7c2fec011abe16da74711b54.zip | |
[CMake] Passthrough CFLAGS when checking the compiler-rt path
This is needed when cross-compiling for a different target since
CFLAGS may contain additional flags like -resource-dir which
change the location in which compiler-rt builtins are found.
Differential Revision: https://reviews.llvm.org/D54371
llvm-svn: 346820
| -rw-r--r-- | compiler-rt/cmake/Modules/HandleCompilerRT.cmake | 3 | ||||
| -rw-r--r-- | libcxx/cmake/Modules/HandleCompilerRT.cmake | 3 | ||||
| -rw-r--r-- | libcxxabi/cmake/Modules/HandleCompilerRT.cmake | 3 | ||||
| -rw-r--r-- | libunwind/cmake/Modules/HandleCompilerRT.cmake | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/compiler-rt/cmake/Modules/HandleCompilerRT.cmake b/compiler-rt/cmake/Modules/HandleCompilerRT.cmake index 855d0ff9df1..364cdccc84d 100644 --- a/compiler-rt/cmake/Modules/HandleCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/HandleCompilerRT.cmake @@ -4,6 +4,9 @@ function(find_compiler_rt_library name variable) if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET) list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}") endif() + get_property(SANITIZER_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE) + string(REPLACE " " ";" SANITIZER_CXX_FLAGS "${SANITIZER_CXX_FLAGS}") + list(APPEND CLANG_COMMAND ${SANITIZER_CXX_FLAGS}) execute_process( COMMAND ${CLANG_COMMAND} RESULT_VARIABLE HAD_ERROR diff --git a/libcxx/cmake/Modules/HandleCompilerRT.cmake b/libcxx/cmake/Modules/HandleCompilerRT.cmake index 2e0e69e5e08..1ce25657494 100644 --- a/libcxx/cmake/Modules/HandleCompilerRT.cmake +++ b/libcxx/cmake/Modules/HandleCompilerRT.cmake @@ -8,6 +8,9 @@ function(find_compiler_rt_library name dest) if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET) list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}") endif() + get_property(LIBCXX_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE) + string(REPLACE " " ";" LIBCXX_CXX_FLAGS "${LIBCXX_CXX_FLAGS}") + list(APPEND CLANG_COMMAND ${LIBCXX_CXX_FLAGS}) execute_process( COMMAND ${CLANG_COMMAND} RESULT_VARIABLE HAD_ERROR diff --git a/libcxxabi/cmake/Modules/HandleCompilerRT.cmake b/libcxxabi/cmake/Modules/HandleCompilerRT.cmake index 945de585058..1f953276df0 100644 --- a/libcxxabi/cmake/Modules/HandleCompilerRT.cmake +++ b/libcxxabi/cmake/Modules/HandleCompilerRT.cmake @@ -8,6 +8,9 @@ function(find_compiler_rt_library name dest) if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET) list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}") endif() + get_property(LIBCXXABI_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE) + string(REPLACE " " ";" LIBCXXABI_CXX_FLAGS "${LIBCXXABI_CXX_FLAGS}") + list(APPEND CLANG_COMMAND ${LIBCXXABI_CXX_FLAGS}) execute_process( COMMAND ${CLANG_COMMAND} RESULT_VARIABLE HAD_ERROR diff --git a/libunwind/cmake/Modules/HandleCompilerRT.cmake b/libunwind/cmake/Modules/HandleCompilerRT.cmake index 275243a1bc6..77168e59946 100644 --- a/libunwind/cmake/Modules/HandleCompilerRT.cmake +++ b/libunwind/cmake/Modules/HandleCompilerRT.cmake @@ -8,6 +8,9 @@ function(find_compiler_rt_library name dest) if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET) list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}") endif() + get_property(LIBUNWIND_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE) + string(REPLACE " " ";" LIBUNWIND_CXX_FLAGS "${LIBUNWIND_CXX_FLAGS}") + list(APPEND CLANG_COMMAND ${LIBUNWIND_CXX_FLAGS}) execute_process( COMMAND ${CLANG_COMMAND} RESULT_VARIABLE HAD_ERROR |
