aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog5
-rwxr-xr-xgold/configure2
-rw-r--r--gold/configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index e13b492..ad8e4a7 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,10 @@
2013-01-04 Cary Coutant <ccoutant@google.com>
+ * configure.ac: Fix typo restoring CXXFLAGS.
+ * configure: Regenerate.
+
+2013-01-04 Cary Coutant <ccoutant@google.com>
+
* testsuite/Makefile.am (CXXLINK_S): New macro.
(debug_msg_so.err, debug_msg_ndebug.err): Use CXXLINK_S.
* testsuite/Makefile.in: Regenerate.
diff --git a/gold/configure b/gold/configure
index 22d9b48..e3c0bda 100755
--- a/gold/configure
+++ b/gold/configure
@@ -7320,7 +7320,7 @@ else
gold_cv_hash_off_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-CXXFLAGS=$CFLAGS_hold
+CXXFLAGS=$CXXFLAGS_hold
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gold_cv_hash_off_t" >&5
$as_echo "$gold_cv_hash_off_t" >&6; }
diff --git a/gold/configure.ac b/gold/configure.ac
index 9d23835..e49d6e8 100644
--- a/gold/configure.ac
+++ b/gold/configure.ac
@@ -546,7 +546,7 @@ std::tr1::hash<off_t> h;
],
[gold_cv_hash_off_t=yes],
[gold_cv_hash_off_t=no])
-CXXFLAGS=$CFLAGS_hold])
+CXXFLAGS=$CXXFLAGS_hold])
if test "$gold_cv_hash_off_t" = "yes"; then
AC_DEFINE(HAVE_TR1_HASH_OFF_T, 1,
[Define if std::tr1::hash<off_t> is usable])