Skip to content

[libcxxabi] Always link against libzircon for Fuchsia targets #115910

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
merged 5 commits into from
Dec 9, 2024
Merged

[libcxxabi] Always link against libzircon for Fuchsia targets #115910

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70828dc
[𝘀𝗽𝗿] initial version
ilovepi Nov 12, 2024
6203a67
Use --as-needed when adding libzircon
ilovepi Nov 14, 2024
498c161
Actually use --as-needed in the correct patch
ilovepi Nov 14, 2024
6feaf3b
Add TODO for CMake feature in 3.24
ilovepi Nov 18, 2024
7f13f36
Fix TODO and rebase
ilovepi Dec 9, 2024
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
6 changes: 6 additions & 0 deletions libcxxabi/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ if (NOT APPLE) # On Apple platforms, we always use -nostdlib++ so we don't need
add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
endif()

if (FUCHSIA)
# TODO use CMAKE_LINK_LIBRARY_USING_FEATURE once our minimum CMake is at least 3.24
# https://cmake.org/cmake/help/latest/variable/CMAKE_LINK_LIBRARY_USING_FEATURE.html
add_link_flags("-Wl,--push-state,--as-needed,-lzircon,--pop-state")
Copy link
Member

@petrhosek petrhosek Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd leave a TODO comment to use https://cmake.org/cmake/help/latest/variable/CMAKE_LINK_LIBRARY_USING_FEATURE.html once LLVM requires CMake at least 3.24.

Copy link
Contributor Author

@ilovepi ilovepi Nov 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

Copy link
Member

@MaskRay MaskRay Dec 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: $upper_case is more common than TODO

Copy link
Contributor Author

@ilovepi ilovepi Dec 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Thx.

endif()

if (NOT LIBCXXABI_USE_COMPILER_RT)
add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc)
endif()
Expand Down
Loading