diff mbox

toolchain-external: fix uClibc-ng 64bit dynamic loader link

Message ID b301100fe3edad0eed23cf5557548fe014410899.1437035134.git.baruch@tkos.co.il
State Accepted
Headers show

Commit Message

Baruch Siach July 16, 2015, 8:25 a.m. UTC
Commit 34f95bf9dbb0 (toolchain-external: fix support of uClibc-ng toolchains,
2015-07-13) added the missing ld-uClibc.so.1 dynamic linker symlink that
binaries expect when linked with uClibc-ng. However on 64bit targets the
linker is called ld64-uClibc.so.1. Handle that case as well.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 toolchain/toolchain-external/toolchain-external.mk | 3 +++
 1 file changed, 3 insertions(+)

Comments

Thomas Petazzoni July 16, 2015, 9:12 p.m. UTC | #1
Dear Baruch Siach,

On Thu, 16 Jul 2015 11:25:34 +0300, Baruch Siach wrote:
> Commit 34f95bf9dbb0 (toolchain-external: fix support of uClibc-ng toolchains,
> 2015-07-13) added the missing ld-uClibc.so.1 dynamic linker symlink that
> binaries expect when linked with uClibc-ng. However on 64bit targets the
> linker is called ld64-uClibc.so.1. Handle that case as well.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  toolchain/toolchain-external/toolchain-external.mk | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index fcb033ca2ebf..ce9d79f2fa41 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -730,6 +730,9 @@  define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO
 	if test -e $(TARGET_DIR)/lib/ld-uClibc.so.1; then \
 		ln -sf ld-uClibc.so.1 $(TARGET_DIR)/lib/ld-uClibc.so.0 ; \
 	fi
+	if test -e $(TARGET_DIR)/lib/ld64-uClibc.so.1; then \
+		ln -sf ld64-uClibc.so.1 $(TARGET_DIR)/lib/ld64-uClibc.so.0 ; \
+	fi
 endef
 
 define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS