The_Great_Archive/libretroshare
1
0
Fork 0
mirror of https://github.com/RetroShare/libretroshare.git synced 2026-09-12 19:50:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

Android: reword the libdl comment and point at the upstream rnp PR

Browse Source 
The ordering claim only holds for linkers that resolve archives in a single
pass; the NDK's lld picks libdl.a up either way. Reference rnpgp/rnp#2473 so
the sed can be dropped once it lands.
This commit is contained in:
jolavillette 2026-08-30 10:38:05 +02:00
parent bd4485e6b8
commit 2be2034bf6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/Android/prepare-toolchain-clang.sh
View File

@ -888,9 +888,10 @@ endif(CMAKE_CROSSCOMPILING_EMULATOR)' \
# >>> dso_dlfcn.o:(dlfcn_load) in archive .../libcrypto.a
#
# The NDK ships a static libdl.a defining those symbols, so link it
# explicitly. It has to come after libcrypto.a for the static linker to
# pick it up, hence a linked library rather than CMAKE_EXE_LINKER_FLAGS,
# which CMake places before the objects.
# explicitly, as a linked library rather than CMAKE_EXE_LINKER_FLAGS so
# it is ordered after libcrypto.a for linkers that resolve archives in a
# single pass (lld does not care, GNU ld does).
# Submitted upstream as rnpgp/rnp#2473; drop this sed once it is in.
sed -i \
's|(findopensslfeatures PRIVATE OpenSSL::Crypto)|(findopensslfeatures PRIVATE OpenSSL::Crypto dl)|' \
"${S_dir}/cmake/Modules/FindOpenSSLFeatures.cmake"