Makefile.tpl (configure-stageN-MODULE): Pass --with-build-libsubdir for stages after the first.

2006-07-18  Paolo Bonzini  <bonzini@gnu.org>

        * Makefile.tpl (configure-stageN-MODULE): Pass --with-build-libsubdir
        for stages after the first.

config:
2006-07-18  Paolo Bonzini  <bonzini@gnu.org>

        * acx.m4: Support --with-build-libsubdir and AC_SUBST
        build_libsubdir.

gcc:
2006-07-18  Paolo Bonzini  <bonzini@gnu.org>

        * configure: Regenerate.
        * Makefile.in (build_libsubdir): New configure substitution
        (build_libobjdir): New variable.
        (BUILD_LIBIBERTY): Use it.

libgfortran:
2006-07-18  Paolo Bonzini  <bonzini@gnu.org>

        * configure: Regenerate.

libjava:
2006-07-18  Paolo Bonzini  <bonzini@gnu.org>

        * configure: Regenerate.

libobjc:
2006-07-18  Paolo Bonzini  <bonzini@gnu.org>

        * configure: Regenerate.

From-SVN: r115552

3 files changed, 23 insertions, 3 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a295d6..5cc02be 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-18  Paolo Bonzini  <bonzini@gnu.org>
+
+        * configure: Regenerate.
+        * Makefile.in (build_libsubdir): New configure substitution
+        (build_libobjdir): New variable.
+        (BUILD_LIBIBERTY): Use it.
+
 2006-07-18  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c/28286
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 2514591..7dd4098 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -86,11 +86,14 @@ objdir = @objdir@
 
 host_subdir=@host_subdir@
 build_subdir=@build_subdir@
+build_libsubdir=@build_libsubdir@
 
 ifeq ($(host_subdir),.)
 build_objdir := ../$(build_subdir)
+build_libobjdir := ../$(build_libsubdir)
 else
 build_objdir := ../../$(build_subdir)
+build_libobjdir := ../../$(build_libsubdir)
 endif
 
 # --------
@@ -831,7 +834,7 @@ ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
 
 # Build and host support libraries.
 LIBIBERTY = ../libiberty/libiberty.a
-BUILD_LIBIBERTY = $(build_objdir)/libiberty/libiberty.a
+BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a
 
 # Dependencies on the intl and portability libraries.
 LIBDEPS= $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) $(LIBDECNUMBER)
diff --git a/gcc/configure b/gcc/configure
index 507b4c3..962778c 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1526,7 +1526,17 @@ esac
 
 
 # Determine the target- and build-specific subdirectories
-  # Prefix 'build-' so this never conflicts with target_subdir.
+
+# post-stage1 host modules use a different CC_FOR_BUILD so, in order to
+# have matching libraries, they should use host libraries: Makefile.tpl
+# arranges to pass --with-build-libsubdir=$(HOST_SUBDIR).
+# However, they still use the build modules, because the corresponding
+# host modules (e.g. bison) are only built for the host when bootstrap
+# finishes. So:
+# - build_subdir is where we find build modules, and never changes.
+# - build_libsubdir is where we find build libraries, and can be overridden.
+
+# Prefix 'build-' so this never conflicts with target_subdir.
 build_subdir="build-${build_noncanonical}"
 
 # Check whether --with-build-libsubdir or --without-build-libsubdir was given.
@@ -7641,7 +7651,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:7644: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:7654: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[4-9]*)