diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.def | 4 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | Makefile.tpl | 6 |
4 files changed, 17 insertions, 10 deletions
@@ -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 Mark Shinwell <shinwell@codesourcery.com> * configure.in: Enable gprof for cross builds. diff --git a/Makefile.def b/Makefile.def index 4c58ab5..576f819 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 2d0da2e..1982993 100644 --- a/Makefile.in +++ b/Makefile.in @@ -390,12 +390,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 @@ -39168,7 +39168,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 @@ -40466,13 +40466,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 b83d8d5..e3abcb1 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 |