--- a/configure.ac
+++ b/configure.ac
-@@ -1300,13 +1300,13 @@ if test -z "$LD"; then
+@@ -1277,13 +1277,13 @@ if test -z "$LD"; then
fi
fi
+ LDFLAGS="$LDFLAGS -static-libstdc++"
+ AC_MSG_CHECKING([whether g++ accepts -static-libstdc++])
AC_LANG_PUSH(C++)
- AC_LINK_IFELSE([
+ AC_LINK_IFELSE([AC_LANG_SOURCE([
#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
-@@ -1632,7 +1632,7 @@ AC_ARG_WITH(stage1-ldflags,
+@@ -1609,7 +1609,7 @@ AC_ARG_WITH(stage1-ldflags,
# if supported. But if the user explicitly specified the libraries to use,
# trust that they are doing what they want.
if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then
fi])
AC_SUBST(stage1_ldflags)
-@@ -1661,7 +1661,7 @@ AC_ARG_WITH(boot-ldflags,
+@@ -1638,7 +1638,7 @@ AC_ARG_WITH(boot-ldflags,
# statically. But if the user explicitly specified the libraries to
# use, trust that they are doing what they want.
if test "$poststage1_libs" = ""; then
--- a/configure
+++ b/configure
-@@ -5005,14 +5005,14 @@ if test -z "$LD"; then
+@@ -5043,14 +5043,14 @@ if test -z "$LD"; then
fi
fi
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5795,7 +5795,7 @@ else
+@@ -5833,7 +5833,7 @@ else
# if supported. But if the user explicitly specified the libraries to use,
# trust that they are doing what they want.
if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then
fi
fi
-@@ -5831,7 +5831,7 @@ else
+@@ -5869,7 +5869,7 @@ else
# statically. But if the user explicitly specified the libraries to
# use, trust that they are doing what they want.
if test "$poststage1_libs" = ""; then