diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 13 insertions, 8 deletions
@@ -4,6 +4,11 @@ * configure.ac (cris-*-elf, crisv32-*-elf): Disable target-libffi. * configure: Regenerate. +2010-12-02 Ian Lance Taylor <iant@google.com> + + * configure.ac: Always set default for poststage1_ldflags to + -static-libstdc++ -static-libgcc. + 2010-12-02 Jeff Johnston <jjohnstn@redhat.com> * COPYING.NEWLIB: Add National Semiconductor notice. @@ -5606,10 +5606,10 @@ if test "${with_boot_ldflags+set}" = set; then : fi else poststage1_ldflags= - # With --enable-build-with-cxx, default to linking libstdc++ and - # libgcc statically. But if the user explicitly specified the - # libraries to use, trust that they are doing what they want. - if test "$ENABLE_BUILD_WITH_CXX" = "yes" -a "$poststage1_libs" = ""; then + # In stages 2 and 3, default to linking libstdc++ and libgcc + # 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" fi fi diff --git a/configure.ac b/configure.ac index 440f066..fcf5ba2 100644 --- a/configure.ac +++ b/configure.ac @@ -1561,10 +1561,10 @@ AC_ARG_WITH(boot-ldflags, poststage1_ldflags=$withval fi], [poststage1_ldflags= - # With --enable-build-with-cxx, default to linking libstdc++ and - # libgcc statically. But if the user explicitly specified the - # libraries to use, trust that they are doing what they want. - if test "$ENABLE_BUILD_WITH_CXX" = "yes" -a "$poststage1_libs" = ""; then + # In stages 2 and 3, default to linking libstdc++ and libgcc + # 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" fi]) AC_SUBST(poststage1_ldflags) |