Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53c0b59d authored by Rob Landley's avatar Rob Landley Committed by Linus Torvalds
Browse files

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



With Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

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: default avatarRob Landley <rob@landley.net>
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9ce7677c
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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