[CMake] Cache the compiler-rt library search results
There's a lot of duplicated calls to find various compiler-rt libraries
from build of runtime libraries like libunwind, libc++, libc++abi and
compiler-rt. The compiler-rt helper module already implemented caching
for results avoid repeated Clang invocations.
This change moves the compiler-rt implementation into a shared location
and reuses it from other runtimes to reduce duplication and speed up
the build.
Differential Revision: https://reviews.llvm.org/D88458
GitOrigin-RevId: 22acda48ff32712746dad3079579f03c6e89e04c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96477e2..f16d49a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,8 @@
set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
${CMAKE_MODULE_PATH}
)
diff --git a/cmake/Modules/HandleCompilerRT.cmake b/cmake/Modules/HandleCompilerRT.cmake
deleted file mode 100644
index 77168e5..0000000
--- a/cmake/Modules/HandleCompilerRT.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-function(find_compiler_rt_library name dest)
- if (NOT DEFINED LIBUNWIND_COMPILE_FLAGS)
- message(FATAL_ERROR "LIBUNWIND_COMPILE_FLAGS must be defined when using this function")
- endif()
- set(dest "" PARENT_SCOPE)
- set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBUNWIND_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()
- 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
- OUTPUT_VARIABLE LIBRARY_FILE
- )
- string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
- file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
- string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}")
- if (NOT HAD_ERROR AND EXISTS "${LIBRARY_FILE}")
- message(STATUS "Found compiler-rt library: ${LIBRARY_FILE}")
- set(${dest} "${LIBRARY_FILE}" PARENT_SCOPE)
- else()
- message(STATUS "Failed to find compiler-rt library")
- endif()
-endfunction()
-
-function(find_compiler_rt_dir dest)
- if (NOT DEFINED LIBUNWIND_COMPILE_FLAGS)
- message(FATAL_ERROR "LIBUNWIND_COMPILE_FLAGS must be defined when using this function")
- endif()
- set(dest "" PARENT_SCOPE)
- if (APPLE)
- set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBUNWIND_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)
- file(TO_CMAKE_PATH "${LIBRARY_DIR}" LIBRARY_DIR)
- set(LIBRARY_DIR "${LIBRARY_DIR}/darwin")
- else()
- set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBUNWIND_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)
- file(TO_CMAKE_PATH "${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)
- else()
- message(STATUS "Failed to find compiler-rt directory")
- endif()
-endfunction()
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 4ca6bdd..78f116c 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -40,7 +40,9 @@
list(APPEND CMAKE_REQUIRED_LIBRARIES c)
endif ()
if (LIBUNWIND_USE_COMPILER_RT)
- find_compiler_rt_library(builtins LIBUNWIND_BUILTINS_LIBRARY)
+ include(HandleCompilerRT)
+ find_compiler_rt_library(builtins LIBUNWIND_BUILTINS_LIBRARY
+ FLAGS ${LIBUNWIND_COMPILE_FLAGS})
list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBUNWIND_BUILTINS_LIBRARY}")
else ()
if (LIBUNWIND_HAS_GCC_S_LIB)