Skip to content

[llvm-libgcc] Fix symlink path for libcc when LLVM_ENABLE_PER_TARGET_… #165487

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[llvm-libgcc] Fix symlink path for libcc when LLVM_ENABLE_PER_TARGET_… #165487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d21ab66
Fix symlink path for libgcc
kraj Oct 28, 2025
919fcd1
[llvm-libgcc] Fix libgcc.a symlink path when LLVM_ENABLE_PER_TARGET_R…
kraj Oct 29, 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
26 changes: 21 additions & 5 deletions llvm-libgcc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,27 @@ target_link_libraries(unwind_shared PUBLIC
#===============================================================================

get_compiler_rt_install_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} install_dir_builtins)
string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}")
string(FIND "${install_dir_builtins}" "clang" install_path_contains_triple)
if(install_path_contains_triple EQUAL -1)
set(builtins_suffix "-${COMPILER_RT_DEFAULT_TARGET_ARCH}")

# Extract the relative path starting from 'clang' or after 'lib/'
if(IS_ABSOLUTE "${install_dir_builtins}")
# For absolute paths, extract starting from 'clang/' if it exists
string(REGEX MATCH "clang/.*$" install_dir_builtins_temp "${install_dir_builtins}")
if(install_dir_builtins_temp)
set(install_dir_builtins "${install_dir_builtins_temp}")
else()
# Fallback: strip up to first lib/
string(REGEX REPLACE "^.*/lib/" "" install_dir_builtins "${install_dir_builtins}")
endif()
else()
string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}")
endif()

# Always add the architecture suffix
set(builtins_suffix "-${COMPILER_RT_DEFAULT_TARGET_ARCH}")

# Only prepend ../ when using per-target runtime directories
string(FIND "${install_dir_builtins}" "clang" install_path_contains_triple)
if(install_path_contains_triple GREATER -1 AND LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
string(PREPEND install_dir_builtins "../")
endif()
set(LLVM_LIBGCC_COMPILER_RT ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a)
Expand All @@ -137,7 +153,7 @@ add_custom_target(llvm-libgcc ALL
DEPENDS unwind_shared unwind_static clang_rt.builtins-${COMPILER_RT_DEFAULT_TARGET_ARCH}
COMMAND ${CMAKE_COMMAND} -E create_symlink ${LLVM_LIBGCC_COMPILER_RT} libgcc.a
COMMAND ${CMAKE_COMMAND} -E create_symlink libunwind.a libgcc_eh.a
COMMAND ${CMAKE_COMMAND} -E create_symlink libunwind.so libgcc_s.so.1.0
COMMAND ${CMAKE_COMMAND} -E create_symlink libunwind.so.1 libgcc_s.so.1.0
COMMAND ${CMAKE_COMMAND} -E create_symlink libgcc_s.so.1.0 libgcc_s.so.1
COMMAND ${CMAKE_COMMAND} -E create_symlink libgcc_s.so.1 libgcc_s.so
)
Expand Down
Loading