Skip to content

[runtimes] Remove dependencies on cxx_experimental for test-suite installs #171678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldionne merged 2 commits into from
Dec 12, 2025
Merged

[runtimes] Remove dependencies on cxx_experimental for test-suite installs #171678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca5ec85
[runtimes] Remove dependencies on cxx_experimental for test-suite ins…
ldionne Dec 10, 2025
7633caf
Merge branch 'main' into review/fix-test-suite-dependencies
ldionne Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions libcxx/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ set_target_properties(cxx_experimental
cxx_add_common_build_flags(cxx_experimental)
target_compile_options(cxx_experimental PUBLIC -D_LIBCPP_ENABLE_EXPERIMENTAL)

# Add a meta-target for both libraries.
add_custom_target(cxx)
# Add a meta-target for both libraries and the experimental library.
add_custom_target(cxx DEPENDS cxx_experimental)
if (LIBCXX_ENABLE_SHARED)
add_dependencies(cxx cxx_shared)
endif()
Expand Down Expand Up @@ -389,9 +389,6 @@ if (NOT CMAKE_CONFIGURATION_TYPES)
add_custom_target(install-cxx-stripped
COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_BINARY_DIR}" --component cxx --strip)

add_dependencies(install-cxx cxx_experimental)
add_dependencies(install-cxx-stripped cxx_experimental)

if (LIBCXX_INSTALL_LIBRARY)
add_dependencies(install-cxx cxx)
add_dependencies(install-cxx-stripped cxx)
Expand Down
3 changes: 0 additions & 3 deletions libcxx/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ foreach(target IN LISTS libcxx_test_suite_install_targets)
--component "${target}")
add_dependencies(cxx-test-depends libcxx-test-suite-install-${target})
endforeach()
if (TARGET cxx_experimental)
add_dependencies(libcxx-test-suite-install-cxx cxx_experimental)
endif()

set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
set(SERIALIZED_LIT_PARAMS "# Lit parameters serialized here for llvm-lit to pick them up\n")
Expand Down
3 changes: 0 additions & 3 deletions libcxxabi/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ foreach(target IN LISTS libcxxabi_test_suite_install_targets)
--component "${target}")
add_dependencies(cxxabi-test-depends libcxxabi-test-suite-install-${target})
endforeach()
if (TARGET cxx_experimental)
add_dependencies(libcxxabi-test-suite-install-cxx cxx_experimental)
endif()

pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)

Expand Down
2 changes: 1 addition & 1 deletion libunwind/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endmacro()
set(LIBUNWIND_TESTING_INSTALL_PREFIX "${LIBUNWIND_BINARY_DIR}/test-suite-install")
set(libunwind_test_suite_install_targets unwind-headers unwind)
if ("libcxx" IN_LIST LLVM_ENABLE_RUNTIMES)
list(APPEND libunwind_test_suite_install_targets cxx-headers cxx cxx_experimental cxx-modules cxxabi-headers cxxabi)
list(APPEND libunwind_test_suite_install_targets cxx-headers cxx cxx-modules cxxabi-headers cxxabi)
endif()
foreach(target IN LISTS libunwind_test_suite_install_targets)
add_custom_target(libunwind-test-suite-install-${target} DEPENDS "${target}"
Expand Down
Loading