[PATCH] uml: fix dynamic linking on some 64-bit distros

53c0b59d · Rob Landley <[email protected]> · 2005-12-18 17:50:35 +01:00

With Paolo 'Blaisorblade' Giarrusso <[email protected]>

The current UML build assumes that on x86-64 systems, /lib is a symlink
to /lib64, but in some distributions (like PLD and CentOS) they are
separate directories, so the 64 bit library loader isn't found.  This
patch inserts /lib64 at the start of the rpath on x86-64 UML builds.

Signed-off-by: Rob Landley <[email protected]>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 53c0b59dcdb7c68c3cfd4b9a0bd17373b785f2eb
Parents: 9ce7677c

Changes

1 files changed · +4 −0

File	Status	Add	Del	Content
arch/um/Makefile-x86_64	modified	+4	−0	View file

arch/um/Makefile-x86_64

View file

diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 4f118d5..38df311 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -12,3 +12,7 @@ CHECKFLAGS  += -m64
 
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64
+
+# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
+
+LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64