2017-02-11 16:37:53 +00:00
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
2019-10-14 15:37:28 +00:00
|
|
|
@@ -1283,13 +1283,13 @@ if test -z "$LD"; then
|
2017-02-11 16:37:53 +00:00
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
-# Check whether -static-libstdc++ -static-libgcc is supported.
|
|
|
|
|
+# Check whether -static-libstdc++ is supported.
|
|
|
|
|
have_static_libs=no
|
|
|
|
|
if test "$GCC" = yes; then
|
|
|
|
|
saved_LDFLAGS="$LDFLAGS"
|
|
|
|
|
|
|
|
|
|
- LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
|
|
|
|
|
- AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
|
|
|
|
|
+ LDFLAGS="$LDFLAGS -static-libstdc++"
|
|
|
|
|
+ AC_MSG_CHECKING([whether g++ accepts -static-libstdc++])
|
|
|
|
|
AC_LANG_PUSH(C++)
|
2018-09-06 12:44:17 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
2017-02-11 16:37:53 +00:00
|
|
|
#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
|
2019-10-14 15:37:28 +00:00
|
|
|
@@ -1629,7 +1629,7 @@ AC_ARG_WITH(stage1-ldflags,
|
2017-02-11 16:37:53 +00:00
|
|
|
# trust that they are doing what they want.
|
2019-10-14 15:37:28 +00:00
|
|
|
if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
|
|
|
|
|
-a "$have_static_libs" = yes; then
|
2017-02-11 16:37:53 +00:00
|
|
|
- stage1_ldflags="-static-libstdc++ -static-libgcc"
|
|
|
|
|
+ stage1_ldflags="-static-libstdc++"
|
|
|
|
|
fi])
|
|
|
|
|
AC_SUBST(stage1_ldflags)
|
|
|
|
|
|
2019-10-14 15:37:28 +00:00
|
|
|
@@ -1658,7 +1658,7 @@ AC_ARG_WITH(boot-ldflags,
|
2017-02-11 16:37:53 +00:00
|
|
|
# statically. But if the user explicitly specified the libraries to
|
|
|
|
|
# use, trust that they are doing what they want.
|
|
|
|
|
if test "$poststage1_libs" = ""; then
|
|
|
|
|
- poststage1_ldflags="-static-libstdc++ -static-libgcc"
|
|
|
|
|
+ poststage1_ldflags="-static-libstdc++"
|
|
|
|
|
fi])
|
|
|
|
|
AC_SUBST(poststage1_ldflags)
|
|
|
|
|
|
|
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
2019-10-14 15:37:28 +00:00
|
|
|
@@ -5053,14 +5053,14 @@ if test -z "$LD"; then
|
2017-02-11 16:37:53 +00:00
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
-# Check whether -static-libstdc++ -static-libgcc is supported.
|
|
|
|
|
+# Check whether -static-libstdc++ is supported.
|
|
|
|
|
have_static_libs=no
|
|
|
|
|
if test "$GCC" = yes; then
|
|
|
|
|
saved_LDFLAGS="$LDFLAGS"
|
|
|
|
|
|
|
|
|
|
- LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
|
|
|
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
|
|
|
|
|
-$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
|
|
|
|
|
+ LDFLAGS="$LDFLAGS -static-libstdc++"
|
|
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++" >&5
|
|
|
|
|
+$as_echo_n "checking whether g++ accepts -static-libstdc++... " >&6; }
|
|
|
|
|
ac_ext=cpp
|
|
|
|
|
ac_cpp='$CXXCPP $CPPFLAGS'
|
|
|
|
|
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
2019-10-14 15:37:28 +00:00
|
|
|
@@ -5861,7 +5861,7 @@ else
|
2017-02-11 16:37:53 +00:00
|
|
|
# trust that they are doing what they want.
|
2019-10-14 15:37:28 +00:00
|
|
|
if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
|
|
|
|
|
-a "$have_static_libs" = yes; then
|
2017-02-11 16:37:53 +00:00
|
|
|
- stage1_ldflags="-static-libstdc++ -static-libgcc"
|
|
|
|
|
+ stage1_ldflags="-static-libstdc++"
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2019-10-14 15:37:28 +00:00
|
|
|
@@ -5897,7 +5897,7 @@ else
|
2017-02-11 16:37:53 +00:00
|
|
|
# statically. But if the user explicitly specified the libraries to
|
|
|
|
|
# use, trust that they are doing what they want.
|
|
|
|
|
if test "$poststage1_libs" = ""; then
|
|
|
|
|
- poststage1_ldflags="-static-libstdc++ -static-libgcc"
|
|
|
|
|
+ poststage1_ldflags="-static-libstdc++"
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
