aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac6
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b526a8f..f655adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-23 Eric Botcazou <ebotcazou@adacore.com>
+
+ PR bootstrap/54820
+ * configure.ac (have_static_libs): Force 'no' for GCC version < 4.5.
+ * configure: Regenerate.
+
2012-10-22 Eric Botcazou <ebotcazou@adacore.com>
PR bootstrap/54820
diff --git a/configure b/configure
index b2d28d5..4d9fc2a 100755
--- a/configure
+++ b/configure
@@ -4892,6 +4892,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+
+#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+#error -static-libstdc++ not implemented
+#endif
int main() {}
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
diff --git a/configure.ac b/configure.ac
index 958eadd..c6665a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1190,7 +1190,11 @@ if test "$GCC" = yes; then
LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
AC_LANG_PUSH(C++)
- AC_LINK_IFELSE([int main() {}],
+ AC_LINK_IFELSE([
+#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+#error -static-libstdc++ not implemented
+#endif
+int main() {}],
[AC_MSG_RESULT([yes]); have_static_libs=yes],
[AC_MSG_RESULT([no])])
AC_LANG_POP(C++)