This is an archive of the discontinued LLVM Phabricator instance.

Differential D86773

[libcxx] Link target `cxx_external_threads` to `cxx-headers` for BUILD_EXTERNAL_THREAD_LIBRARY
ClosedPublic

Authored by Nicu on Aug 28 2020, 3:44 AM.

Details

Reviewers
ldionne
miyuki
Group Reviewers
Restricted Project
Commits
rG722db5c0b4e8: [libcxx] Link target `cxx_external_threads` to `cxx-headers` for…
Summary

Fix compilation of libcxx when using -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY. Target cxx_external_threads gets linked to cxx-headers to include all needed headers and flags.

Diff Detail

Event Timeline

Nicu created this revision.Aug 28 2020, 3:44 AM
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald TranscriptAug 28 2020, 3:44 AM
Herald added subscribers: libcxx-commits, dexonsmith, mgorny. · View Herald Transcript
Nicu requested review of this revision.Aug 28 2020, 3:44 AM
Harbormaster completed remote builds in B69903: Diff 288569.Aug 28 2020, 3:58 AM
ldionne accepted this revision.Aug 28 2020, 10:17 AM
This revision is now accepted and ready to land.Aug 28 2020, 10:17 AM
Nicu mentioned this in D86598: [libcxx] Fix compile for BUILD_EXTERNAL_THREAD_LIBRARY.Sep 1 2020, 1:04 AM
This revision was landed with ongoing or failed builds.Sep 1 2020, 4:44 AM
Closed by commit rG722db5c0b4e8: [libcxx] Link target `cxx_external_threads` to `cxx-headers` for… (authored by Nicu, committed by miyuki). · Explain Why
This revision was automatically updated to reflect the committed changes.
miyuki added a commit: rG722db5c0b4e8: [libcxx] Link target `cxx_external_threads` to `cxx-headers` for….

Revision Contents

PathSize
libcxx/
src/
5 lines

Diff 289135

libcxx/src/CMakeLists.txt

Show First 20 Lines • Show All 317 Lines • ▼ Show 20 Lines PROPERTIES
COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}" COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
OUTPUT_NAME "c++experimental" OUTPUT_NAME "c++experimental"
) )
cxx_add_common_build_flags(cxx_experimental) cxx_add_common_build_flags(cxx_experimental)
endif() endif()
if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
file(GLOB LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES ../test/support/external_threads.cpp) set(LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/../test/support/external_threads.cpp")
if (LIBCXX_ENABLE_SHARED) if (LIBCXX_ENABLE_SHARED)
add_library(cxx_external_threads SHARED ${LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES}) add_library(cxx_external_threads SHARED ${LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES})
else() else()
add_library(cxx_external_threads STATIC ${LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES}) add_library(cxx_external_threads STATIC ${LIBCXX_EXTERNAL_THREADING_SUPPORT_SOURCES})
endif() endif()
set_target_properties(cxx_external_threads set_target_properties(cxx_external_threads
PROPERTIES PROPERTIES
LINK_FLAGS "${LIBCXX_LINK_FLAGS}" LINK_FLAGS "${LIBCXX_LINK_FLAGS}"
COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}" COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
OUTPUT_NAME "c++external_threads" OUTPUT_NAME "c++external_threads"
) )
target_link_libraries(cxx_external_threads PRIVATE cxx-headers)
endif() endif()
if (LIBCXX_INSTALL_LIBRARY) if (LIBCXX_INSTALL_LIBRARY)
if (LIBCXX_INSTALL_SHARED_LIBRARY) if (LIBCXX_INSTALL_SHARED_LIBRARY)
install(TARGETS cxx_shared install(TARGETS cxx_shared
ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx)
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines