diff options
| author | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2017-03-14 04:12:29 +0000 |
|---|---|---|
| committer | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2017-03-14 04:12:29 +0000 |
| commit | 704c8a929b1f93ff808b3c8d1ecfd914c72f7c67 (patch) | |
| tree | f304b845fc8d0851b457d6bea4e66f0ddc3485ee /libcxx/cmake/Modules/HandleCompilerRT.cmake | |
| parent | ff8534b8964b74614dd5399ff1343061f1b8619f (diff) | |
| download | bcm5719-llvm-704c8a929b1f93ff808b3c8d1ecfd914c72f7c67.tar.gz bcm5719-llvm-704c8a929b1f93ff808b3c8d1ecfd914c72f7c67.zip | |
Fix cmake to find the compiler-rt libs on darwin
Followup for r297553, which left darwin in a broken state
http://green.lab.llvm.org/green/job/clang-stage2-cmake-RgSan_build/3812
rdar://problem/31011980
llvm-svn: 297703
Diffstat (limited to 'libcxx/cmake/Modules/HandleCompilerRT.cmake')
| -rw-r--r-- | libcxx/cmake/Modules/HandleCompilerRT.cmake | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/libcxx/cmake/Modules/HandleCompilerRT.cmake b/libcxx/cmake/Modules/HandleCompilerRT.cmake index d7c4247dff7..9730008319c 100644 --- a/libcxx/cmake/Modules/HandleCompilerRT.cmake +++ b/libcxx/cmake/Modules/HandleCompilerRT.cmake @@ -25,15 +25,27 @@ function(find_compiler_rt_dir 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} - "--rtlib=compiler-rt" "--print-libgcc-file-name") - execute_process( - COMMAND ${CLANG_COMMAND} - RESULT_VARIABLE HAD_ERROR - OUTPUT_VARIABLE LIBRARY_FILE - ) - string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE) - get_filename_component(LIBRARY_DIR "${LIBRARY_FILE}" DIRECTORY) + if (APPLE) + set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS} + "-print-file-name=lib") + execute_process( + COMMAND ${CLANG_COMMAND} + RESULT_VARIABLE HAD_ERROR + OUTPUT_VARIABLE LIBRARY_DIR + ) + string(STRIP "${LIBRARY_DIR}" LIBRARY_DIR) + set(LIBRARY_DIR "${LIBRARY_DIR}/darwin") + else() + set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS} + "--rtlib=compiler-rt" "--print-libgcc-file-name") + execute_process( + COMMAND ${CLANG_COMMAND} + RESULT_VARIABLE HAD_ERROR + OUTPUT_VARIABLE LIBRARY_FILE + ) + string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE) + get_filename_component(LIBRARY_DIR "${LIBRARY_FILE}" DIRECTORY) + endif() if (NOT HAD_ERROR AND EXISTS "${LIBRARY_DIR}") message(STATUS "Found compiler-rt directory: ${LIBRARY_DIR}") set(${dest} "${LIBRARY_DIR}" PARENT_SCOPE) |
