From 9e2ef09802236b555b4de1d706e2e8cce095b885 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sun, 18 Feb 1996 20:06:40 +0000 Subject: [PATCH] * configure.host: Check for 'do not mix' from native linker before trying to use -rpath. --- bfd/ChangeLog | 5 +++++ bfd/configure.host | 2 ++ ld/ChangeLog | 5 +++++ ld/configure.host | 2 ++ 4 files changed, 14 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d059eddcec1..b9e39cc1ebc 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 18 15:02:25 1996 Ian Lance Taylor + + * 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 * bfd.c (_bfd_get_gp_value): New function. diff --git a/bfd/configure.host b/bfd/configure.host index a7150c53e7b..320faa4df71 100644 --- 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 96e420a423b..ae0be0718b4 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 18 15:05:17 1996 Ian Lance Taylor + + * 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 * configure.in: Remove explicit substitution of CFLAGS; autoconf diff --git a/ld/configure.host b/ld/configure.host index 2e74df7df7a..a05f20b6bd8 100644 --- 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 -- 2.30.2