diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/doc/install.texi | 5 |
5 files changed, 21 insertions, 10 deletions
@@ -1,3 +1,8 @@ +2010-12-02 Ian Lance Taylor <iant@google.com> + + * configure.ac: Always set default for poststage1_ldflags to + -static-libstdc++ -static-libgcc. + 2010-11-29 Andreas Schwab <schwab@redhat.com> * configure.ac: Move comment to remove extra space in last argument @@ -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 65c0a74..289416f 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) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a29b13a..ccfce94 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-12-02 Ian Lance Taylor <iant@google.com> + + * doc/install.texi (Configuration): Update default for + --with-boot-ldflags. + 2010-12-02 Nathan Froyd <froydnj@codesourcery.com> PR c/45062 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index e67793a..5bdd35b 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -1611,8 +1611,9 @@ of GCC. These are also used when linking GCC if configured with @item --with-boot-ldflags=@var{flags} This option may be used to set linker flags to be used when linking -stage 2 and later when bootstrapping GCC. By default no special flags -are used. +stage 2 and later when bootstrapping GCC. If neither --with-boot-libs +nor --with-host-libstdcxx is set to a value, then the default is +@samp{-static-libstdc++ -static-libgcc}. @item --with-boot-libs=@var{libs} This option may be used to set libraries to be used when linking stage 2 |