From 4f11b2237e37a2e99df3d2ea4b8099641913f339 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 7 Dec 2010 21:20:22 +0000 Subject: [PATCH] * configure.ac: Always set default for poststage1_ldflags to -static-libstdc++ -static-libgcc. --- ChangeLog | 5 +++++ configure | 8 ++++---- configure.ac | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a65fe33472c..fbe634ef6c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ * configure.ac (cris-*-elf, crisv32-*-elf): Disable target-libffi. * configure: Regenerate. +2010-12-02 Ian Lance Taylor + + * configure.ac: Always set default for poststage1_ldflags to + -static-libstdc++ -static-libgcc. + 2010-12-02 Jeff Johnston * COPYING.NEWLIB: Add National Semiconductor notice. diff --git a/configure b/configure index 6a3ff4570ae..6dde71a00d7 100755 --- a/configure +++ b/configure @@ -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 440f066acbe..fcf5ba2c7c8 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) -- 2.30.2