From c1cb7e02385908b330da7c76461d83c56782a0c3 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 19 Jul 2006 17:06:06 +0000 Subject: 2006-07-19 Paolo Bonzini * Makefile.tpl (configure-stageN-MODULE): Pass --with-build-libsubdir for stages after the first. * Makefile.in: Regenerate. config: 2006-07-19 Paolo Bonzini * acx.m4: Support --with-build-libsubdir and AC_SUBST build_libsubdir. --- config/ChangeLog | 5 +++++ config/acx.m4 | 15 +++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'config') diff --git a/config/ChangeLog b/config/ChangeLog index d5e0440..104b1fb 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2006-07-18 Paolo Bonzini + + * acx.m4: Support --with-build-libsubdir and AC_SUBST + build_libsubdir. + 2006-06-13 Richard Earnshaw Alexandre Oliva diff --git a/config/acx.m4 b/config/acx.m4 index 7c4c213..76456fb 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -74,8 +74,22 @@ dnl # amount to a lot more with autoconf 2.5x. AC_DEFUN([GCC_TOPLEV_SUBDIRS], [AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_TARGET]) []dnl AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl + +# 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}" +AC_ARG_WITH(build-libsubdir, +[ --with-build-libsubdir=[DIR] Directory where to find libraries for build system], +build_libsubdir="$withval", +build_libsubdir="$build_subdir") # --srcdir=. covers the toplevel, while "test -d" covers the subdirectories if ( test $srcdir = . && test -d gcc ) \ || test -d $srcdir/../host-${host_noncanonical}; then @@ -85,6 +99,7 @@ else fi # No prefix. target_subdir=${target_noncanonical} +AC_SUBST([build_libsubdir]) []dnl AC_SUBST([build_subdir]) []dnl AC_SUBST([host_subdir]) []dnl AC_SUBST([target_subdir]) []dnl -- cgit v1.1