aboutsummaryrefslogtreecommitdiff
path: root/gcc/configure
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gcc.gnu.org>2006-07-18 11:48:36 +0000
committerPaolo Bonzini <bonzini@gcc.gnu.org>2006-07-18 11:48:36 +0000
commit57255173dac51b82ac40d272a3b8dc82fd452413 (patch)
treea56aa5731a43b79c2fbeb7154a5d689a68dae271 /gcc/configure
parent834c81642ad78338ac7048f4c183dc582bf7ca11 (diff)
downloadgcc-57255173dac51b82ac40d272a3b8dc82fd452413.zip
gcc-57255173dac51b82ac40d272a3b8dc82fd452413.tar.gz
gcc-57255173dac51b82ac40d272a3b8dc82fd452413.tar.bz2
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
Diffstat (limited to 'gcc/configure')
-rwxr-xr-xgcc/configure14
1 files changed, 12 insertions, 2 deletions
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]*)