aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2011-07-02 00:31:35 +0000
committerIan Lance Taylor <ian@airs.com>2011-07-02 00:31:35 +0000
commitdd7af0746398caad45ce0c78316c501029e257ac (patch)
tree208c8ec8f1a723b9de8ab30466f3412da3127e2b
parent328c7c2f681aeea5792099d68349c440a5a3d663 (diff)
downloadgdb-dd7af0746398caad45ce0c78316c501029e257ac.zip
gdb-dd7af0746398caad45ce0c78316c501029e257ac.tar.gz
gdb-dd7af0746398caad45ce0c78316c501029e257ac.tar.bz2
Correct last commit.
-rwxr-xr-xgold/configure1
-rw-r--r--gold/configure.ac7
2 files changed, 5 insertions, 3 deletions
diff --git a/gold/configure b/gold/configure
index 66c9d82..b882223 100755
--- a/gold/configure
+++ b/gold/configure
@@ -6132,6 +6132,7 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+LDFLAGS=$LDFLAGS_hold
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gold_cv_lib_static" >&5
$as_echo "$gold_cv_lib_static" >&6; }
diff --git a/gold/configure.ac b/gold/configure.ac
index 47120b4..949c8c3 100644
--- a/gold/configure.ac
+++ b/gold/configure.ac
@@ -265,11 +265,12 @@ dnl Test for whether static linking is supported. Some systems do not
dnl install static libraries. This only affects the set of tests that
dnl we run.
AC_CACHE_CHECK([whether static linking works], [gold_cv_lib_static],
-LDFLAGS_hold=$LDFLAGS
+[LDFLAGS_hold=$LDFLAGS
LDFLAGS="$LDFLAGS -static"
-[AC_LINK_IFELSE([
+AC_LINK_IFELSE([
AC_LANG_PROGRAM([[void f() { }]])],
-[gold_cv_lib_static=yes], [gold_cv_lib_static=no])])
+[gold_cv_lib_static=yes], [gold_cv_lib_static=no])
+LDFLAGS=$LDFLAGS_hold])
AM_CONDITIONAL(HAVE_STATIC, test "$gold_cv_lib_static" = "yes")
dnl Some architectures do not support taking pointers of functions