This is an archive of the discontinued LLVM Phabricator instance.

Differential D60448

[CMake] Fix statically linking in libcxxabi if built separately
ClosedPublic

Authored by mstorsjo on Apr 9 2019, 2:41 AM.

Details

Reviewers
ldionne
phosek
EricWF
Commits
rCXX358009: [CMake] Fix statically linking in libcxxabi if built separately
rGc90045bf1096: [CMake] Fix statically linking in libcxxabi if built separately
rL358009: [CMake] Fix statically linking in libcxxabi if built separately
Summary

In this case, CMake doesn't know about the c++abi target within the same CMake run.

This reverts this aspect back to how it was before SVN r357811.

Diff Detail

Repository
rL LLVM

Event Timeline

mstorsjo created this revision.Apr 9 2019, 2:41 AM
Herald added a reviewer: EricWF. · View Herald TranscriptApr 9 2019, 2:41 AM
Herald added subscribers: dexonsmith, mgorny. · View Herald Transcript
ldionne accepted this revision.Apr 9 2019, 5:23 AM
This revision is now accepted and ready to land.Apr 9 2019, 5:23 AM
Closed by commit rL358009: [CMake] Fix statically linking in libcxxabi if built separately (authored by mstorsjo). · Explain WhyApr 9 2019, 7:29 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptApr 9 2019, 7:30 AM
Herald added subscribers: llvm-commits, christof. · View Herald Transcript

Revision Contents

PathSize
libcxx/
trunk/
lib/
4 lines

Diff 194322

libcxx/trunk/lib/CMakeLists.txt

Show First 20 Lines • Show All 168 Lines • ▼ Show 20 Lines PROPERTIES
SOVERSION "${LIBCXX_ABI_VERSION}" SOVERSION "${LIBCXX_ABI_VERSION}"
DEFINE_SYMBOL "" DEFINE_SYMBOL ""
) )
cxx_set_common_defines(cxx_shared) cxx_set_common_defines(cxx_shared)
# Link against libc++abi # Link against libc++abi
if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY) if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
if (APPLE) if (APPLE)
target_link_libraries(cxx_shared PRIVATE "-Wl,-force_load" "$<TARGET_LINKER_FILE:${LIBCXX_CXX_STATIC_ABI_LIBRARY}>") target_link_libraries(cxx_shared PRIVATE "-Wl,-force_load" "${LIBCXX_CXX_STATIC_ABI_LIBRARY}")
else() else()
target_link_libraries(cxx_shared PRIVATE "-Wl,--whole-archive,-Bstatic" "$<TARGET_LINKER_FILE:${LIBCXX_CXX_STATIC_ABI_LIBRARY}>" "-Wl,-Bdynamic,--no-whole-archive") target_link_libraries(cxx_shared PRIVATE "-Wl,--whole-archive,-Bstatic" "${LIBCXX_CXX_STATIC_ABI_LIBRARY}" "-Wl,-Bdynamic,--no-whole-archive")
endif() endif()
else() else()
target_link_libraries(cxx_shared PRIVATE "${LIBCXX_CXX_SHARED_ABI_LIBRARY}") target_link_libraries(cxx_shared PRIVATE "${LIBCXX_CXX_SHARED_ABI_LIBRARY}")
list(APPEND LIBCXX_INTERFACE_LIBRARIES "${LIBCXX_CXX_SHARED_ABI_LIBRARY}") # For the linker script list(APPEND LIBCXX_INTERFACE_LIBRARIES "${LIBCXX_CXX_SHARED_ABI_LIBRARY}") # For the linker script
list(APPEND LIBCXX_LIBRARIES "${LIBCXX_CXX_SHARED_ABI_LIBRARY}") # For the benchmarks list(APPEND LIBCXX_LIBRARIES "${LIBCXX_CXX_SHARED_ABI_LIBRARY}") # For the benchmarks
endif() endif()
# Maybe re-export symbols from libc++abi # Maybe re-export symbols from libc++abi
▲ Show 20 Lines • Show All 205 Lines • Show Last 20 Lines