diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2006-05-25 08:00:56 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gnu.org> | 2006-05-25 08:00:56 +0000 |
| commit | c5a04b88b4399f43a82ff2ce3cb237becbfe0898 (patch) | |
| tree | 04a075bce323ebf36851306d040fbf4e4c691608 | |
| parent | 0f0fd4aeb71fc701da802492ce7eba7d6488c3fb (diff) | |
2006-05-25 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (bfd, opcodes): Fix lib_path.
* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Replace ADAC with ADAFLAGS.
(restrap): Move under "@if gcc-bootstrap". Fix typo.
* Makefile.in: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@114109 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.def | 4 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | Makefile.tpl | 6 |
4 files changed, 19 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 04af025baa7..8d4acaa728c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-05-25 Paolo Bonzini <bonzini@gnu.org> + + * Makefile.def (bfd, opcodes): Fix lib_path. + * Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Replace ADAC with ADAFLAGS. + (restrap): Move under "@if gcc-bootstrap". Fix typo. + * Makefile.in: Regenerate. + 2006-05-24 Carlos O'Donell <carlos@codesourcery.com> * Makefile.in: Regenerate. @@ -109,7 +116,8 @@ * MAINTAINERS (Write After Approval): Remove myself. (Language Front End Maintainers): Add myself as fortran 95 maintainer. -2006-02-21 Rafael Ãvila de EspÃndola <rafael.espindola@gmail.com> +2006-02-21 Rafael Avila de Espindola <rafael.espindola@gmail.com> + * Makefile.tpl (BUILD_CONFIGDIRS): Remove. (TARGET_CONFIGDIRS): Remove. * configure.in: Remove AC_SUBST(target_configdirs). diff --git a/Makefile.def b/Makefile.def index 09d9c987d27..99e8ebe2b13 100644 --- a/Makefile.def +++ b/Makefile.def @@ -37,8 +37,8 @@ host_modules= { module= ash; }; host_modules= { module= autoconf; }; host_modules= { module= automake; }; host_modules= { module= bash; }; -host_modules= { module= bfd; lib_path=.; bootstrap=true; }; -host_modules= { module= opcodes; lib_path=.; bootstrap=true; }; +host_modules= { module= bfd; lib_path=.libs; bootstrap=true; }; +host_modules= { module= opcodes; lib_path=.libs; bootstrap=true; }; host_modules= { module= binutils; bootstrap=true; }; host_modules= { module= bison; no_check_cross= true; }; host_modules= { module= byacc; no_check_cross= true; }; diff --git a/Makefile.in b/Makefile.in index b208df7ae3b..c1a4c2d88a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -386,12 +386,12 @@ HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc: @if bfd HOST_LIB_PATH_bfd = \ - $$r/$(HOST_SUBDIR)/bfd/.:$$r/$(HOST_SUBDIR)/prev-bfd/.: + $$r/$(HOST_SUBDIR)/bfd/.libs:$$r/$(HOST_SUBDIR)/prev-bfd/.libs: @endif bfd @if opcodes HOST_LIB_PATH_opcodes = \ - $$r/$(HOST_SUBDIR)/opcodes/.:$$r/$(HOST_SUBDIR)/prev-opcodes/.: + $$r/$(HOST_SUBDIR)/opcodes/.libs:$$r/$(HOST_SUBDIR)/prev-opcodes/.libs: @endif opcodes @@ -38768,7 +38768,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \ CFLAGS="$(BOOT_CFLAGS)" \ LIBCFLAGS="$(BOOT_CFLAGS)" \ LDFLAGS="$(BOOT_LDFLAGS)" \ - ADAC="\$$(CC)" + "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" # For stage 1: # * We force-disable intermodule optimizations, even if @@ -40066,13 +40066,13 @@ do-distclean: distclean-stage1 # not work as a dependency, just as the minimum necessary to avoid errors. stage_last: $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble -@endif gcc-bootstrap .PHONY: restrap restrap: @: $(MAKE); $(stage) - rm -rf stage1-$(TARGET_SUBDIR) stage2 stage3 stage4 stageprofile stagefeedback + rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagefeedback-* $(MAKE) $(RECURSE_FLAGS_TO_PASS) all +@endif gcc-bootstrap # -------------------------------------- # Dependencies between different modules diff --git a/Makefile.tpl b/Makefile.tpl index b83d8d5abd9..e3abcb1dbb9 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1259,7 +1259,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \ CFLAGS="$(BOOT_CFLAGS)" \ LIBCFLAGS="$(BOOT_CFLAGS)" \ LDFLAGS="$(BOOT_LDFLAGS)" \ - ADAC="\$$(CC)" + "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" # For stage 1: # * We force-disable intermodule optimizations, even if @@ -1428,14 +1428,14 @@ do-distclean: distclean-stage1 # not work as a dependency, just as the minimum necessary to avoid errors. stage_last: $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble -@endif gcc-bootstrap .PHONY: restrap restrap: @: $(MAKE); $(stage) rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev - +]stage[+id+] [+ ENDIF prev +][+ ENDFOR bootstrap-stage +] + +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +] $(MAKE) $(RECURSE_FLAGS_TO_PASS) all +@endif gcc-bootstrap # -------------------------------------- # Dependencies between different modules |