summaryrefslogtreecommitdiffstats
path: root/arch/um/Kconfig
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/um/Kconfig
parentum: virtio/pci: enable suspend/resume (diff)
downloadlinux-386093c68ba3e8bcfe7f46deba901e0e80713c29.tar.xz
linux-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/um/Kconfig')
-rw-r--r--arch/um/Kconfig13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 328ba973c07d..fe6d898aeb85 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -106,6 +106,19 @@ config LD_SCRIPT_DYN
depends on !LD_SCRIPT_STATIC
select MODULE_REL_CRCS if MODVERSIONS
+config LD_SCRIPT_DYN_RPATH
+ bool "set rpath in the binary" if EXPERT
+ default y
+ depends on LD_SCRIPT_DYN
+ help
+ Add /lib (and /lib64 for 64-bit) to the linux binary's rpath
+ explicitly.
+
+ You may need to turn this off if compiling for nix systems
+ that have their libraries in random /nix directories and
+ might otherwise unexpected use libraries from /lib or /lib64
+ instead of the desired ones.
+
config HOSTFS
tristate "Host filesystem"
help