From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 8 Aug 2017 21:13:46 +0000 (-0700)
Subject: ld: Replace --rpath with -Wl,--rpath,
X-Git-Tag: binutils-2_29_1~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffb6dbfed645366a6666708535203e0663e7be45;p=thirdparty%2Fbinutils-gdb.git

ld: Replace --rpath with -Wl,--rpath,

"--rpath ../bfd/.libs ../bfd/.libs/libbfd.so" isn't a valid compiler
command-line option.  We should use -Wl,--rpath, instead of --rpath.

	PR ld/21923
	* configure.ac (TESTBFDLIB): Replace --rpath with -Wl,--rpath,
	for --disable-static.
	* configure: Regenerated.

(cherry picked from commit fe22cbc418b35ed6ea3252a204bd351f8c201e0b and
 9165f4548be8612161fb90cfad9bd0cc6a752c90)
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 61458ebe06b..8b656e66eba 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/21923
+	* configure.ac (TESTBFDLIB): Replace --rpath with -Wl,--rpath,
+	for --disable-static.
+	* configure: Regenerated.
+
 2017-08-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/ld-i386/i386.exp: Run pr21884-nacl.
diff --git a/ld/configure b/ld/configure
index 7b66a4f77b8..20fb84d036c 100755
--- a/ld/configure
+++ b/ld/configure
@@ -17255,7 +17255,7 @@ EMULATION_LIBPATH=$all_libpath
 
 
 if test x${enable_static} = xno; then
-  TESTBFDLIB="--rpath ../bfd/.libs ../bfd/.libs/libbfd.so"
+  TESTBFDLIB="-Wl,--rpath,../bfd/.libs ../bfd/.libs/libbfd.so"
 else
   TESTBFDLIB="../bfd/.libs/libbfd.a"
 fi
diff --git a/ld/configure.ac b/ld/configure.ac
index 34315e67286..6f25d2809e1 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -436,7 +436,7 @@ EMULATION_LIBPATH=$all_libpath
 AC_SUBST(EMULATION_LIBPATH)
 
 if test x${enable_static} = xno; then
-  TESTBFDLIB="--rpath ../bfd/.libs ../bfd/.libs/libbfd.so"
+  TESTBFDLIB="-Wl,--rpath,../bfd/.libs ../bfd/.libs/libbfd.so"
 else
   TESTBFDLIB="../bfd/.libs/libbfd.a"
 fi