diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-22 08:38:04 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-22 08:38:04 +0000 |
| commit | aff6cf7b52dcc8aca45c493c795cd92b054052f8 (patch) | |
| tree | 1c556dcbbcb3585452c3995d226ab8f65f7de88f /Makefile.tpl | |
| parent | 86ad20f60436eca44c5c862a8dd44f8e83981413 (diff) | |
| download | gcc-aff6cf7b52dcc8aca45c493c795cd92b054052f8.tar.gz | |
* Makefile.tpl (experimental top level bootstrap) Move stage1
language setting from all- target to configure- target; disable
intermodule optimization in stage 1; prevent gratuitous rebuilds
of stage 1.
* Makefile.in: Regenerate.
* configure.in: Comma-separate stage 1 language list for top
level bootstrap.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79816 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index a44cc401134..de8559446a6 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1294,7 +1294,11 @@ STAMP = echo timestamp > STAGE1_CFLAGS=@stage1_cflags@ STAGE1_LANGUAGES=@stage1_languages@ -# TODO: deal with OBJS-onestep +# For stage 1: +# * we force-disable intermodule optimizations, even if +# --enable-intermodule was passed. Luckily, autoconf always accepts +# the last* argument when conflicting --enable arguments are passed. +# * we build only C (and possibly Ada). configure-stage1-gcc: echo configure-stage1-gcc > stage_last ; \ if [ -f stage1-gcc/Makefile ] ; then \ @@ -1337,19 +1341,26 @@ configure-stage1-gcc: libsrcdir="$$s/gcc";; \ esac; \ $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} ; \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule \ + --enable-languages="$(STAGE1_LANGUAGES)"; \ cd .. ; \ mv gcc stage1-gcc ; \ $(STAMP) configure-stage1-gcc -all-stage1-gcc: configure-stage1-gcc all-bootstrap +# Real targets act phony if they depend on phony targets; this hack +# prevents gratuitous rebuilding of stage 1. +prebootstrap: + $(MAKE) all-bootstrap + $(STAMP) prebootstrap + +all-stage1-gcc: configure-stage1-gcc prebootstrap echo all-stage1-gcc > stage_last ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ mv stage1-gcc gcc ; \ cd gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) \ - LANGUAGES="$(STAGE1_LANGUAGES)" \ CFLAGS="$(STAGE1_CFLAGS)" \ COVERAGE_FLAGS= || exit 1 ; \ cd .. ; \ |