LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cmake to find the compiler-rt libs on darwin

Browse Source 
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

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@297703 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bruno Cardoso Lopes
2017-03-14 04:12:29 +00:00
parent 5cdf67386f
commit dd1f05915f
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cmake/Modules/HandleCompilerRT.cmake
View File

@@ -25,15 +25,27 @@ function(find_compiler_rt_dir dest)
message(FATAL_ERROR "LIBCXX_COMPILE_FLAGS must be defined when using this function") message(FATAL_ERROR "LIBCXX_COMPILE_FLAGS must be defined when using this function")
endif() endif()
set(dest "" PARENT_SCOPE) set(dest "" PARENT_SCOPE)
set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS} if (APPLE)
"--rtlib=compiler-rt" "--print-libgcc-file-name") set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS}
execute_process( "-print-file-name=lib")
COMMAND ${CLANG_COMMAND} execute_process(
RESULT_VARIABLE HAD_ERROR COMMAND ${CLANG_COMMAND}
OUTPUT_VARIABLE LIBRARY_FILE RESULT_VARIABLE HAD_ERROR
) OUTPUT_VARIABLE LIBRARY_DIR
string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE) )
get_filename_component(LIBRARY_DIR "${LIBRARY_FILE}" DIRECTORY) 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}") if (NOT HAD_ERROR AND EXISTS "${LIBRARY_DIR}")
message(STATUS "Found compiler-rt directory: ${LIBRARY_DIR}") message(STATUS "Found compiler-rt directory: ${LIBRARY_DIR}")
set(${dest} "${LIBRARY_DIR}" PARENT_SCOPE) set(${dest} "${LIBRARY_DIR}" PARENT_SCOPE)