From: ian Date: Thu, 2 Dec 2010 18:06:19 +0000 (+0000) Subject: ./: X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=7deb2d7096f0ee61d7205b09cddc2bdf83942196 ./: * configure.ac: Always set default for poststage1_ldflags to -static-libstdc++ -static-libgcc. gcc/: * doc/install.texi (Configuration): Update default for --with-boot-ldflags. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167382 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/ChangeLog b/ChangeLog index cc57c27c59a..ef3d5245bcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-12-02 Ian Lance Taylor + + * configure.ac: Always set default for poststage1_ldflags to + -static-libstdc++ -static-libgcc. + 2010-11-29 Andreas Schwab * configure.ac: Move comment to remove extra space in last argument diff --git a/configure b/configure index 683341345d1..de6da33de97 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 65c0a74cda9..289416f79f6 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 a29b13ae71c..ccfce94f4be 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-12-02 Ian Lance Taylor + + * doc/install.texi (Configuration): Update default for + --with-boot-ldflags. + 2010-12-02 Nathan Froyd PR c/45062 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index e67793ac5ea..5bdd35b4c2a 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