VisionFive2 Linux kernel

author: Johannes Berg <johannes.berg@intel.com> 2021-03-08 14:02:37 +0100 committer: Richard Weinberger <richard@nod.at> 2021-06-17 21:54:15 +0200 commit: 386093c68ba3e8bcfe7f46deba901e0e80713c29 parent: 43c590cb86665be702c0af0231a10ec813df9cfd

Commit Summary:

um: allow not setting extra rpaths in the linux binary

Diffstat:

1 file changed, 2 insertions, 1 deletion

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 1cea46ff9bb7..12a7acef0357 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -118,7 +118,8 @@ archprepare:
 	$(Q)$(MAKE) $(build)=$(HOST_DIR)/um include/generated/user_constants.h
 
 LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)
+LINK-$(CONFIG_LD_SCRIPT_DYN) += $(call cc-option, -no-pie)
+LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib
 
 CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \
 	-fno-stack-protector $(call cc-option, -fno-stack-protector-all)