diff options
| -rw-r--r-- | libcxx/cmake/Modules/HandleLibCXXABI.cmake | 32 | ||||
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 15 |
2 files changed, 25 insertions, 22 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index 44c59a57341..10f100f7f0f 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -8,7 +8,8 @@ # # Parameters: # abidefines: A list of defines needed to compile libc++ with the ABI library -# abilib : The ABI library to link against. +# abishared : The shared ABI library to link against. +# abistatic : The static ABI library to link against. # abifiles : A list of files (which may be relative paths) to copy into the # libc++ build tree for the build. These files will be copied # twice: once into include/, so the libc++ build itself can find @@ -19,7 +20,7 @@ # in the libc++ build directory. # -macro(setup_abi_lib abidefines abilib abifiles abidirs) +macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) list(APPEND LIBCXX_COMPILE_FLAGS ${abidefines}) set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${LIBCXX_CXX_ABI_INCLUDE_PATHS}" CACHE PATH @@ -29,7 +30,8 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) CACHE PATH "Paths to C++ ABI library directory" ) - set(LIBCXX_CXX_ABI_LIBRARY ${abilib}) + set(LIBCXX_CXX_SHARED_ABI_LIBRARY ${abishared}) + set(LIBCXX_CXX_STATIC_ABI_LIBRARY ${abistatic}) set(LIBCXX_ABILIB_FILES ${abifiles}) foreach(fpath ${LIBCXX_ABILIB_FILES}) @@ -93,28 +95,30 @@ if ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libstdc++" OR endif() setup_abi_lib( "-D__GLIBCXX__ ${_LIBSUPCXX_DEFINES}" - "${_LIBSUPCXX_LIBNAME}" "${_LIBSUPCXX_INCLUDE_FILES}" "bits" + "${_LIBSUPCXX_LIBNAME}" "${_LIBSUPCXX_LIBNAME}" "${_LIBSUPCXX_INCLUDE_FILES}" "bits" ) elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi") if (LIBCXX_CXX_ABI_INTREE) # Link against just-built "cxxabi" target. - if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY) - set(CXXABI_LIBNAME cxxabi_static) - else() - set(CXXABI_LIBNAME cxxabi_shared) - endif() + set(CXXABI_SHARED_LIBNAME cxxabi_shared) + set(CXXABI_STATIC_LIBNAME cxxabi_static) else() # Assume c++abi is installed in the system, rely on -lc++abi link flag. - set(CXXABI_LIBNAME "c++abi") + set(CXXABI_SHARED_LIBNAME "c++abi") + set(CXXABI_STATIC_LIBNAME "c++abi") endif() - set(HEADERS "cxxabi.h;__cxxabi_config.h") if (LIBCXX_CXX_ABI_SYSTEM) set(HEADERS "") + else() + set(HEADERS "cxxabi.h;__cxxabi_config.h") endif() - setup_abi_lib("-DLIBCXX_BUILDING_LIBCXXABI" ${CXXABI_LIBNAME} "${HEADERS}" "") + setup_abi_lib( + "-DLIBCXX_BUILDING_LIBCXXABI" + "${CXXABI_SHARED_LIBNAME}" "${CXXABI_STATIC_LIBNAME}" "${HEADERS}" "") elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxrt") - setup_abi_lib("-DLIBCXXRT" - "cxxrt" "cxxabi.h;unwind.h;unwind-arm.h;unwind-itanium.h" "" + setup_abi_lib( + "-DLIBCXXRT" + "cxxrt" "cxxrt" "cxxabi.h;unwind.h;unwind-arm.h;unwind-itanium.h" "" ) elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "vcruntime") # Nothing TODO diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index 50b7e28aa1b..d7791c24644 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -59,16 +59,16 @@ endif() if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY) if (APPLE) - add_library_flags("-Wl,-force_load" "${LIBCXX_CXX_ABI_LIBRARY}") + add_library_flags("-Wl,-force_load" "${LIBCXX_CXX_STATIC_ABI_LIBRARY}") else() add_library_flags("-Wl,--whole-archive" "-Wl,-Bstatic") - add_library_flags("${LIBCXX_CXX_ABI_LIBRARY}") + add_library_flags("${LIBCXX_CXX_STATIC_ABI_LIBRARY}") add_library_flags("-Wl,-Bdynamic" "-Wl,--no-whole-archive") endif() elseif (LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS) - add_library_flags("${LIBCXX_CXX_ABI_LIBRARY}") + add_library_flags("${LIBCXX_CXX_SHARED_ABI_LIBRARY}") else () - add_interface_library("${LIBCXX_CXX_ABI_LIBRARY}") + add_interface_library("${LIBCXX_CXX_SHARED_ABI_LIBRARY}") endif() if (APPLE AND LLVM_USE_SANITIZER) @@ -253,12 +253,11 @@ if (LIBCXX_ENABLE_STATIC) if (LIBCXX_CXX_ABI_LIBRARY_PATH) set(MERGE_ARCHIVES_SEARCH_PATHS "-L${LIBCXX_CXX_ABI_LIBRARY_PATH}") endif() - if ((TARGET ${LIBCXX_CXX_ABI_LIBRARY}) OR - (${LIBCXX_CXX_ABI_LIBRARY} MATCHES "cxxabi(_static|_shared)?" AND HAVE_LIBCXXABI)) - set(MERGE_ARCHIVES_ABI_TARGET "$<TARGET_LINKER_FILE:cxxabi_static>") + if (TARGET "${LIBCXX_CXX_STATIC_ABI_LIBRARY}" OR HAVE_LIBCXXABI) + set(MERGE_ARCHIVES_ABI_TARGET "$<TARGET_LINKER_FILE:${LIBCXX_CXX_STATIC_ABI_LIBRARY}>") else() set(MERGE_ARCHIVES_ABI_TARGET - "${CMAKE_STATIC_LIBRARY_PREFIX}${LIBCXX_CXX_ABI_LIBRARY}${CMAKE_STATIC_LIBRARY_SUFFIX}") + "${CMAKE_STATIC_LIBRARY_PREFIX}${LIBCXX_CXX_STATIC_ABI_LIBRARY}${CMAKE_STATIC_LIBRARY_SUFFIX}") endif() add_custom_command(TARGET cxx_static POST_BUILD COMMAND |
