diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2006-02-20 08:34:53 +0000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2006-02-20 08:34:53 +0000 |
| commit | ec92c4d6ab6630301aac88aa2d0bbd7c2094e445 (patch) | |
| tree | 055bea339f89005e29797612127073b8b3cf2c5b /Makefile.def | |
| parent | badc4941651e38bda79e6a6058591e9cf235830a (diff) | |
| download | cygnal-ec92c4d6ab6630301aac88aa2d0bbd7c2094e445.tar.gz cygnal-ec92c4d6ab6630301aac88aa2d0bbd7c2094e445.tar.bz2 cygnal-ec92c4d6ab6630301aac88aa2d0bbd7c2094e445.zip | |
2006-02-20 Paolo Bonzini <bonzini@gnu.org>
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.
Diffstat (limited to 'Makefile.def')
| -rw-r--r-- | Makefile.def | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.def b/Makefile.def index 49b33f025..3227a4456 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 ; |