aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile.um
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2021-03-08 14:02:37 +0100
committerRichard Weinberger <richard@nod.at>2021-06-17 21:54:15 +0200
commit386093c68ba3e8bcfe7f46deba901e0e80713c29 (patch)
tree30d50917cbe514bff2ebf8d9180e6c4193a02b7b /arch/x86/Makefile.um
parentum: virtio/pci: enable suspend/resume (diff)
downloadlinux-dev-386093c68ba3e8bcfe7f46deba901e0e80713c29.tar.xz
linux-dev-386093c68ba3e8bcfe7f46deba901e0e80713c29.zip
um: allow not setting extra rpaths in the linux binary
There doesn't seem to be any reason for the rpath being set in the binaries, at on systems that I tested on. On the other hand, setting rpath is actually harming binaries in some cases, e.g. if using nix-based compilation environments where /lib & /lib64 are not part of the actual environment. Add a new Kconfig option (under EXPERT, for less user confusion) that allows disabling the rpath additions. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/x86/Makefile.um')
-rw-r--r--arch/x86/Makefile.um2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
index 1db7913795f5..b3c1ae084180 100644
--- a/arch/x86/Makefile.um
+++ b/arch/x86/Makefile.um
@@ -44,7 +44,7 @@ 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
+LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib64
LINK-y += -m64
endif