* configure.host: Check for 'do not mix' from native linker before

	trying to use -rpath.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d059edd..b9e39cc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 18 15:02:25 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+       * configure.host: Check for 'do not mix' from native linker before
+       trying to use -rpath.
+
 Fri Feb 16 12:46:18 1996  Ian Lance Taylor  <ian@cygnus.com>
 
        * bfd.c (_bfd_get_gp_value): New function.

diff --git a/bfd/configure.host b/bfd/configure.host
index a7150c5..320faa4 100644 (file)
--- a/bfd/configure.host
+++ b/bfd/configure.host
@@ -113,6 +113,8 @@ case "${host}" in
       :
     elif grep 'No such file' conftest.t >/dev/null 2>&1; then
       :
+    elif grep 'do not mix' conftest.t >/dev/null 2>&1; then
+      :
     elif [ "${shared}" = "true" ]; then
       HLDFLAGS='-Wl,-rpath=$(libdir)'
     else

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 96e420a..ae0be07 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 18 15:05:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+       * configure.host: Check for 'do not mix' from native linker before
+       trying to use -rpath.
+
 Thu Feb 15 13:58:06 1996  Ian Lance Taylor  <ian@cygnus.com>
 
        * configure.in: Remove explicit substitution of CFLAGS; autoconf

diff --git a/ld/configure.host b/ld/configure.host
index 2e74df7..a05f20b 100644 (file)
--- a/ld/configure.host
+++ b/ld/configure.host
@@ -162,6 +162,8 @@ case "${host}" in
       :
     elif grep 'No such file' conftest.t >/dev/null 2>&1; then
       :
+    elif grep 'do not mix' conftest.t >/dev/null 2>&1; then
+      :
     elif test "${shared}" = "true"; then
       HLDFLAGS='-Wl,-rpath=$(libdir)'
     else