diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-04-05 22:53:05 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-04-05 22:53:05 +0000 |
| commit | 1662a857dbd02c4ec3fea5ae9b55805e87102c52 (patch) | |
| tree | 5b78295371205e014df36e0724093e121f56fad9 /cmake/Modules | |
| parent | 607e0c71ec4f7fd377ad3f6c47b08dbe89f66eaa (diff) | |
[CMake][libcxx] Use builtins rather than gcc_s when compiler-rt is requested
When compiler-rt is requested, we should attempt to link compiler-rt
builtins library rather than gcc_s.
Differential Revision: https://reviews.llvm.org/D31617
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@299599 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/HandleCompilerRT.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/Modules/HandleCompilerRT.cmake b/cmake/Modules/HandleCompilerRT.cmake index 973000831..41cdd44b3 100644 --- a/cmake/Modules/HandleCompilerRT.cmake +++ b/cmake/Modules/HandleCompilerRT.cmake @@ -3,8 +3,11 @@ function(find_compiler_rt_library name dest) message(FATAL_ERROR "LIBCXX_COMPILE_FLAGS must be defined when using this function") endif() set(dest "" PARENT_SCOPE) - set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS} + set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${TARGET_TRIPLE} ${LIBCXX_COMPILE_FLAGS} "--rtlib=compiler-rt" "--print-libgcc-file-name") + if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET) + list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}") + endif() execute_process( COMMAND ${CLANG_COMMAND} RESULT_VARIABLE HAD_ERROR |