From cc11cc9b0fc9846ab9bd4914edc28cbdf406f9c1 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 20 Feb 2006 08:29:17 +0000 Subject: re PR bootstrap/25670 (build fail with 'make all-gcc') 2006-02-20 Paolo Bonzini PR bootstrap/25670 * Makefile.tpl ([+compare-target+]): Print explanation messages. * Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES): New flags_to_pass. * Makefile.tpl (BASE_FLAGS_TO_PASS): Support optional flags_to_pass. (EXTRA_GCC_FLAGS): Remove ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES, BUILD_PREFIX, BUILD_PREFIX_1. * configure.in: (BUILD_PREFIX, BUILD_PREFIX_1): Don't substitute. * Makefile.def (bootstrap stage 1): Pass LIBCFLAGS too. * Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Override LIBCFLAGS too. * Makefile.tpl (configure-stage[+id+]-[+prefix+][+module+], all-stage[+id+]-[+prefix+][+module+], : Use $(current_stage) instead of `cat stage_current`. Always provide the `r' and `s' variables. (clean-stage[+id+]-[+prefix+][+module+]): Likewise, and make it into a single shell execution. (configure-[+prefix+][+module+], all-[+prefix+][+module+]): For bootstrapped modules, make the stage1 module if the build was not started yet, else build the current stage. (all-host, all-target): Omit bootstrapped modules (if bootstrapping). (all-build, all-host, all-target, [+make_target+]-host, [+make_target+]-target): Do not use \-continued lines. (target modules): Depend on stage_last, not all-gcc, if bootstrapping. (current_stage, restrap, stage_last): New. * Makefile.in: Regenerate. * configure: Regenerate. gcc: 2006-02-20 Paolo Bonzini PR bootstrap/25476 * Makefile.in (LDFLAGS): Define from autoconf substitution. * Makefile.in (BOOTSTRAPPING): New. (quickstrap): New definition if BOOTSTRAPPING=yes. * Makefile.in (CONFIG_LANGUAGES): Substitute all_selected_languages. * configure.ac: Substitute all_selected_languages with the languages that were configured. For all the other variables except lang_specs_files, include all the languages in the tree. * configure: Regenerate. * Makefile.in (stmp-fixinc): Copy includes from the prev-gcc directory, if there is one. Run the commands to run fixincludes in the same subshell. * doc/makefile.texi: Document new makefile targets from toplevel bootstrap. * doc/install.texi: Document exact conventions for searching target tools. Document --with-build-time-tools. Document toplevel bootstrap. Document something more about building an Ada cross-compiler. Don't list GNU Make requirements which affect all platforms. From-SVN: r111295 --- Makefile.def | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile.def') diff --git a/Makefile.def b/Makefile.def index 49b33f0..3227a44 100644 --- a/Makefile.def +++ b/Makefile.def @@ -207,7 +207,9 @@ flags_to_pass = { flag= SHELL ; }; flags_to_pass = { flag= YACC ; }; // Host tools +flags_to_pass = { flag= ADAFLAGS ; optional=true ; }; flags_to_pass = { flag= AR_FLAGS ; }; +flags_to_pass = { flag= BOOT_ADAFLAGS ; optional=true ; }; flags_to_pass = { flag= BOOT_CFLAGS ; }; flags_to_pass = { flag= BOOT_LDFLAGS ; }; flags_to_pass = { flag= CFLAGS ; }; @@ -241,6 +243,7 @@ flags_to_pass = { flag= STRIP_FOR_TARGET ; }; flags_to_pass = { flag= WINDRES_FOR_TARGET ; }; // Miscellaneous +flags_to_pass = { flag= LANGUAGES ; optional=true ; }; flags_to_pass = { flag= LEAN ; }; // Inter-module dependencies @@ -461,7 +464,7 @@ bootstrap_stage = { id=1 ; stage_configure_flags='--disable-intermodule \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; - stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; }; + stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"' ; }; bootstrap_stage = { id=2 ; prev=1 ; bootstrap_target=bootstrap2 ; -- cgit v1.1