From 30ce157e6d6e780b3b14ca08a2f9023b5dd2ad15 Mon Sep 17 00:00:00 2001
From: Steve Ellcey <sje@cup.hp.com>
Date: Sun, 10 Jan 2010 20:23:08 +0000
Subject: re PR target/37454 (gcc: unrecognized option '-rdynamic')

2010-01-10  Steve Ellcey  <sje@cup.hp.com>

	PR target/37454
	* configure.ac: Save and restore LDFLAGS and LIBS
	* configure: Regenerate.

From-SVN: r155792
---
 gcc/ChangeLog    | 6 ++++++
 gcc/configure    | 4 ++++
 gcc/configure.ac | 4 ++++
 3 files changed, 14 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8869f7f..708befd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-10  Steve Ellcey  <sje@cup.hp.com>
+
+	PR target/37454
+	* configure.ac: Save and restore LDFLAGS and LIBS
+	* configure: Regenerate.
+
 2010-01-10  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/42667
diff --git a/gcc/configure b/gcc/configure
index 4a1fe5b..c150ee0 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -25036,6 +25036,7 @@ $as_echo_n "checking for -rdynamic... " >&6; }
   fi
 
   # Check -ldl
+  saved_LIBS="$LIBS"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
 if test "${ac_cv_search_dlopen+set}" = set; then :
@@ -25095,8 +25096,10 @@ fi
   if test x"$ac_cv_search_dlopen" = x"-ldl"; then
     pluginlibs="$pluginlibs -ldl"
   fi
+  LIBS="$saved_LIBS"
 
   # Check that we can build shared objects with -fPIC -shared
+  saved_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS -fPIC -shared"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
 $as_echo_n "checking for -fPIC -shared... " >&6; }
@@ -25124,6 +25127,7 @@ rm -f core conftest.err conftest.$ac_objext \
     pluginlibs=
     enable_plugin=no
   fi
+  LDFLAGS="$saved_LDFLAGS"
 
   # If plugin support had been requested but not available, fail.
   if test x"$enable_plugin" = x"no" ; then
diff --git a/gcc/configure.ac b/gcc/configure.ac
index ab1d775..e5d9baf 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4314,12 +4314,15 @@ if test x"$enable_plugin" = x"yes"; then
   fi
 
   # Check -ldl
+  saved_LIBS="$LIBS"
   AC_SEARCH_LIBS([dlopen], [dl])
   if test x"$ac_cv_search_dlopen" = x"-ldl"; then
     pluginlibs="$pluginlibs -ldl"
   fi
+  LIBS="$saved_LIBS"
 
   # Check that we can build shared objects with -fPIC -shared
+  saved_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS -fPIC -shared"
   AC_MSG_CHECKING([for -fPIC -shared])
   AC_TRY_LINK(
@@ -4330,6 +4333,7 @@ if test x"$enable_plugin" = x"yes"; then
     pluginlibs=
     enable_plugin=no
   fi
+  LDFLAGS="$saved_LDFLAGS"
 
   # If plugin support had been requested but not available, fail.
   if test x"$enable_plugin" = x"no" ; then
-- 
cgit v1.1