X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.tpl;h=42531d0f752b6e12481728b4df8696ab0604ba93;hb=ec91a2c28980fd0ecbf02e698dab76c100c1018b;hp=fed68247581706f10044f5023ce5ea6b3af04ff2;hpb=9cb3fa6fd242b34da6824ce77783b730ae34c353;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.tpl b/Makefile.tpl index fed6824758..42531d0f75 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -104,10 +104,11 @@ SET_LIB_PATH = @SET_LIB_PATH@ # Some platforms don't like blank entries, so we remove duplicate, # leading and trailing colons. REALLY_SET_LIB_PATH = \ + @SET_GCC_LIB_PATH@ \ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); # This is the list of directories to be built for the build system. -BUILD_CONFIGDIRS = libiberty libbanshee +BUILD_CONFIGDIRS = libiberty # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring @@ -151,6 +152,9 @@ SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring # directories built for the host system. HOST_CONFIGARGS = @host_configargs@ +# Host programs are put under this directory, which is . except if building +# with srcdir=.. +HOST_SUBDIR = @host_subdir@ # This is the list of variables to export in the environment when # configuring subdirectories for the host system. HOST_EXPORTS = \ @@ -173,13 +177,19 @@ HOST_EXPORTS = \ OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \ TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ - GMPINC="$(HOST_GMPINC)"; export GMPINC; + GMPINC="$(HOST_GMPINC)"; export GMPINC; \ + SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \ + @SET_GCC_LIB_PATH@ # Similar, for later GCC stages. STAGE_HOST_EXPORTS = \ $(HOST_EXPORTS) \ - CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ - CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; + CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ + CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \ + $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ + -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; # This is set by the configure script to the list of directories which # should be built using the target tools. @@ -198,7 +208,7 @@ BASE_TARGET_EXPORTS = \ CC="$(CC_FOR_TARGET)"; export CC; \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ @@ -207,7 +217,9 @@ BASE_TARGET_EXPORTS = \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ NM="$(NM_FOR_TARGET)"; export NM; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ - WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ + SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \ + @SET_GCC_LIB_PATH@ RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ @@ -248,6 +260,10 @@ CXX_FOR_BUILD = $(CXX) BUILD_PREFIX = @BUILD_PREFIX@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ +# Flags to pass to stage2 and later makes. They are defined +# here so that they can be overridden by Makefile fragments. +BOOT_CFLAGS= -g -O2 + CONFIGURED_BISON = @CONFIGURED_BISON@ BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \ echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \ @@ -296,8 +312,9 @@ MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \ # (Default to avoid splitting info files by setting the threshold high.) MAKEINFOFLAGS = --split-size=5000000 -EXPECT = `if [ -f $$r/expect/expect ] ; \ - then echo $$r/expect/expect ; \ +# FIXME: expect may become a build tool? +EXPECT = `if [ -f $$r/$(HOST_SUBDIR)/expect/expect ] ; \ + then echo $$r/$(HOST_SUBDIR)/expect/expect ; \ else echo expect ; fi` RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ @@ -310,7 +327,7 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the host machine work. -HOST_LIB_PATH = $$r/bfd:$$r/opcodes +HOST_LIB_PATH = $$r/$(HOST_SUBDIR)/bfd:$$r/$(HOST_SUBDIR)/opcodes AS = @AS@ @@ -351,8 +368,8 @@ FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ AR_FOR_TARGET=@AR_FOR_TARGET@ CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@ USUAL_AR_FOR_TARGET = ` \ - if [ -f $$r/binutils/ar ] ; then \ - echo $$r/binutils/ar ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/ar ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/ar ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(AR); \ @@ -364,9 +381,9 @@ USUAL_AR_FOR_TARGET = ` \ AS_FOR_TARGET=@AS_FOR_TARGET@ CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@ USUAL_AS_FOR_TARGET = ` \ - if [ -f $$r/gas/as-new ] ; then \ - echo $$r/gas/as-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ + if [ -f $$r/$(HOST_SUBDIR)/gas/as-new ] ; then \ + echo $$r/$(HOST_SUBDIR)/gas/as-new ; \ + elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \ $(CC_FOR_TARGET) -print-prog-name=as ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ @@ -387,7 +404,8 @@ CFLAGS_FOR_TARGET = -O2 $(CFLAGS) # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. GCC_FOR_TARGET=@GCC_FOR_TARGET@ -USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET) +USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) \ + $$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ $(FLAGS_FOR_TARGET) LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) CXX_FOR_TARGET = @CXX_FOR_TARGET@ @@ -400,8 +418,8 @@ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@ USUAL_DLLTOOL_FOR_TARGET = ` \ - if [ -f $$r/binutils/dlltool ] ; then \ - echo $$r/binutils/dlltool ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/dlltool ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/dlltool ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(DLLTOOL); \ @@ -416,9 +434,9 @@ GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@ USUAL_LD_FOR_TARGET = ` \ - if [ -f $$r/ld/ld-new ] ; then \ - echo $$r/ld/ld-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ + if [ -f $$r/$(HOST_SUBDIR)/ld/ld-new ] ; then \ + echo $$r/$(HOST_SUBDIR)/ld/ld-new ; \ + elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \ $(CC_FOR_TARGET) -print-prog-name=ld ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ @@ -433,9 +451,9 @@ LDFLAGS_FOR_TARGET = NM_FOR_TARGET=@NM_FOR_TARGET@ CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ USUAL_NM_FOR_TARGET = ` \ - if [ -f $$r/binutils/nm-new ] ; then \ - echo $$r/binutils/nm-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/nm-new ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/nm-new ; \ + elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \ $(CC_FOR_TARGET) -print-prog-name=nm ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ @@ -448,8 +466,8 @@ USUAL_NM_FOR_TARGET = ` \ RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ USUAL_RANLIB_FOR_TARGET = ` \ - if [ -f $$r/binutils/ranlib ] ; then \ - echo $$r/binutils/ranlib ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/ranlib ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/ranlib ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ if [ x'$(RANLIB)' != x ]; then \ @@ -465,8 +483,8 @@ USUAL_RANLIB_FOR_TARGET = ` \ WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@ USUAL_WINDRES_FOR_TARGET = ` \ - if [ -f $$r/binutils/windres ] ; then \ - echo $$r/binutils/windres ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/windres ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/windres ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(WINDRES); \ @@ -481,14 +499,6 @@ PICFLAG_FOR_TARGET = # Miscellaneous targets and flag lists # ------------------------------------ -@if gcc-bootstrap -# Let's leave this as the first rule in the file until toplevel -# bootstrap is fleshed out completely. -sorry: - @echo Toplevel bootstrap temporarily out of commission. - @echo Please reconfigure without --enable-bootstrap -@endif gcc-bootstrap - # The first rule in the file had better be this one. Don't put any above it. # This lives here to allow makefile fragments to contain dependencies. @default_target@: @@ -641,12 +651,13 @@ do-[+make_target+]: unstage [+make_target+]-host [+make_target+]-target stage # Here are the targets which correspond to the do-X targets. -.PHONY: info installcheck dvi install-info +.PHONY: info installcheck dvi html install-info .PHONY: clean distclean mostlyclean maintainer-clean realclean .PHONY: local-clean local-distclean local-maintainer-clean info: do-info installcheck: do-installcheck dvi: do-dvi +html: do-html # Make sure makeinfo is built before we do a `make info', if we're # in fact building texinfo. @@ -668,6 +679,9 @@ local-distclean: rm -rf $(TARGET_SUBDIR); \ else true; fi -rm -rf $(BUILD_SUBDIR) + -if [ "$(HOST_SUBDIR)" != "." ]; then \ + rm -rf $(HOST_SUBDIR); \ + else true; fi -rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile -rm -f texinfo/doc/Makefile texinfo/po/POTFILES -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null @@ -692,6 +706,7 @@ clean-target-libgcc: (cd gcc/libgcc && find . -type d -print) | \ while read d; do rm -f gcc/$$d/libgcc.a || : ; done -rm -rf gcc/libgcc + -rm -f gcc/stmp-dirs # Check target. @@ -819,38 +834,12 @@ configure-build-[+module+]: echo Configuring in $(BUILD_SUBDIR)/[+module+]; \ cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/[+module+]/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/[+module+]"; \ + libsrcdir="$$s/[+module+]"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(BUILD_CONFIGARGS) $${srcdiroption} \ @@ -882,24 +871,20 @@ maybe-configure-[+module+]: maybe-configure-[+module+]: configure-[+module+] configure-[+module+]: @[+ IF bootstrap +]test -f stage_last && exit 0; \ - [+ ENDIF bootstrap +]test ! -f [+module+]/Makefile || exit 0; \ - [ -d [+module+] ] || mkdir [+module+]; \ + [+ ENDIF bootstrap +]test ! -f $(HOST_SUBDIR)/[+module+]/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/[+module+] ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in [+module+]; \ - cd [+module+] || exit 1; \ + cd $(HOST_SUBDIR)/[+module+] || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/[+module+]"; \ - libsrcdir="$$s/[+module+]";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/[+module+]"; \ - libsrcdir="$$s/[+module+]";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/[+module+]/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/[+module+]"; \ + libsrcdir="$$s/[+module+]"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} [+extra_configure_flags+] \ || exit 1 @@ -908,6 +893,7 @@ configure-[+module+]: .PHONY: all-[+module+] maybe-all-[+module+] maybe-all-[+module+]: @if [+module+] +TARGET-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +] maybe-all-[+module+]: all-[+module+] all-[+module+]: configure-[+module+] @[+ IF bootstrap +]test -f stage_last && exit 0; \ @@ -915,13 +901,8 @@ all-[+module+]: configure-[+module+] s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] [+extra_make_flags+] [+ - IF (== (get "module") "gcc") +] \ - `if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi` [+ - ELSE +]all[+ ENDIF +]) + (cd $(HOST_SUBDIR)/[+module+] && \ + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] $(TARGET-[+module+])) @endif [+module+] .PHONY: check-[+module+] maybe-check-[+module+] @@ -938,8 +919,8 @@ check-[+module+]: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS) [+ - extra_make_flags+] check); \ + (cd $(HOST_SUBDIR)/[+module+] && \ + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check); \ fi [+ ELSE check +] check-[+module+]: @@ -947,8 +928,8 @@ check-[+module+]: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ - extra_make_flags+] check) + (cd $(HOST_SUBDIR)/[+module+] && \ + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check) [+ ENDIF no_check +] @endif [+module+] @@ -964,8 +945,8 @@ install-[+module+]: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ - extra_make_flags+] install) + (cd $(HOST_SUBDIR)/[+module+] && \ + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] install) [+ ENDIF no_install +] @endif [+module+] @@ -992,7 +973,7 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+] eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing [+make_target+] in [+module+]" ; \ - (cd [+module+] && \ + (cd $(HOST_SUBDIR)/[+module+] && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -1033,38 +1014,12 @@ ENDIF raw_cxx +] echo Configuring in $(TARGET_SUBDIR)/[+module+]; \ cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ - esac; \[+ IF stage +] - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \[+ ENDIF stage +] - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \[+ IF stage +] - fi; \[+ ENDIF stage +] + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/[+module+]/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/[+module+]"; \ + libsrcdir="$$s/[+module+]"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -1338,7 +1293,9 @@ stage: # (both in a combined tree, or separately). This however requires some # change to the gcc driver, again in order to avoid comparison failures. -# Bugs: This is almost certainly not parallel-make safe. +# Bugs: This is crippled when doing parallel make, the `make all-host' +# and `make all-target' phases can be parallelized. + # 'touch' doesn't work right on some platforms. STAMP = echo timestamp > @@ -1356,7 +1313,6 @@ STAGE1_LANGUAGES=@stage1_languages@ objext = .o # Flags to pass to stage2 and later makes. -BOOT_CFLAGS= -g -O2 POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ STAGE_PREFIX=$$r/stage[+prev+]-gcc/ \ @@ -1378,18 +1334,25 @@ POSTSTAGE1_FLAGS_TO_PASS = \ stage[+id+]-start:: @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage[+id+] > stage_current ; \ - echo stage[+id+] > stage_last[+ FOR host_modules +][+ IF bootstrap +] + echo stage[+id+] > stage_last; \ + $(mkinstalldirs) $(HOST_SUBDIR)[+ + FOR host_modules +][+ IF bootstrap +] @if [+ module +] - @[ -d stage[+id+]-[+module+] ] || mkdir stage[+id+]-[+module+]; \ - set stage[+id+]-[+module+] [+module+] ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \ - set stage[+prev+]-[+module+] prev-[+module+] ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +] + @cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \ + mkdir stage[+id+]-[+module+]; \ + set stage[+id+]-[+module+] [+module+] ; \ + @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \ + set stage[+prev+]-[+module+] prev-[+module+] ; \ + @CREATE_LINK_TO_DIR@ [+ ENDIF prev +] @endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +] stage[+id+]-end:: @rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +] @if [+ module +] - @set [+module+] stage[+id+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \ - set prev-[+module+] stage[+prev+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +] + @cd $(HOST_SUBDIR); set [+module+] stage[+id+]-[+module+] ; \ + @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \ + set prev-[+module+] stage[+prev+]-[+module+] ; \ + @UNDO_LINK_TO_DIR@ [+ ENDIF prev +] @endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +] # Bubble a bugfix through all the stages up to stage [+id+]. They @@ -1402,20 +1365,27 @@ stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +][+IF lean +] IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \ echo Skipping rebuild of stage[+id+] ; \ else \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage[+id+]; \ fi -.PHONY: all-stage[+id+] +.PHONY: all-stage[+id+] clean-stage[+id+] all-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\ maybe-all-stage[+id+]-[+module+][+ ENDIF bootstrap+] [+ ENDFOR host_modules +] +do-clean: clean-stage[+id+] +clean-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\ + maybe-clean-stage[+id+]-[+module+][+ +ENDIF bootstrap+] [+ ENDFOR host_modules +] + [+ FOR host_modules +][+ IF bootstrap +] .PHONY: configure-stage[+id+]-[+module+] maybe-configure-stage[+id+]-[+module+] .PHONY: all-stage[+id+]-[+module+] maybe-all-stage[+id+]-[+module+] +.PHONY: clean-stage[+id+]-[+module+] maybe-clean-stage[+id+]-[+module+] maybe-configure-stage[+id+]-[+module+]: maybe-all-stage[+id+]-[+module+]: +maybe-clean-stage[+id+]-[+module+]: @if [+module+]-bootstrap maybe-configure-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+] @@ -1427,18 +1397,14 @@ configure-stage[+id+]-[+module+]: $(STAGE_HOST_EXPORTS) [+ ELSE prev +] \ $(HOST_EXPORTS) [+ ENDIF prev +] \ echo Configuring stage [+id+] in [+module+] ; \ - cd [+module+] || exit 1; \ + cd $(HOST_SUBDIR)/[+module+] || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/[+module+]"; \ - libsrcdir="$$s/[+module+]";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/[+module+]"; \ - libsrcdir="$$s/[+module+]";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/[+module+]/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/[+module+]"; \ + libsrcdir="$$s/[+module+]"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ [+stage_configure_flags+] [+extra_configure_flags+] @@ -1450,11 +1416,22 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+] s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \ $(STAGE_HOST_EXPORTS) [+ ELSE prev +] \ $(HOST_EXPORTS) [+ ENDIF prev +] \ - cd [+module+] && \ + cd $(HOST_SUBDIR)/[+module+] && \ $(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \ $(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \ [+stage_make_flags+] [+extra_make_flags+] + +maybe-clean-stage[+id+]-[+module+]: clean-stage[+id+]-[+module+] +clean-stage[+id+]-[+module+]: + @[ -f [+module+]/Makefile ] || [ -f stage[+id+]-[+module+]/Makefile ] \ + || exit 0 ; \ + [ -f [+module+]/Makefile ] || $(MAKE) stage[+id+]-start ; \ + cd $(HOST_SUBDIR)/[+module+] && \ + $(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \ + $(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \ + [+stage_make_flags+] [+extra_make_flags+] clean @endif [+module+]-bootstrap + [+ ENDIF bootstrap +][+ ENDFOR host_modules +] # FIXME: Will not need to be conditional when toplevel bootstrap is the @@ -1494,10 +1471,9 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+] [+bootstrap-target+]: stage[+id+]-bubble [+compare-target+] all [+ ENDIF bootstrap-target +] -.PHONY: distclean-stage[+id+] - -# Rules to wipe a stage and all the following ones, used for cleanstrap +# Rules to wipe a stage and all the following ones, also used for cleanstrap [+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +] +.PHONY: distclean-stage[+id+] distclean-stage[+id+]:: [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : rm -rf stage[+id+]-* [+ @@ -1505,7 +1481,7 @@ distclean-stage[+id+]:: [+ IF cleanstrap-target +] .PHONY: [+cleanstrap-target+] -[+cleanstrap-target+]: distclean-stage1 [+bootstrap-target+] +[+cleanstrap-target+]: distclean [+bootstrap-target+] [+ ENDIF cleanstrap-target +] @endif gcc-bootstrap @@ -1541,6 +1517,12 @@ profiledbootstrap: $(MAKE) stagefeedback-bubble stagefeedback-end @endif gcc-bootstrap +@if gcc-bootstrap +NOTPARALLEL = .NOTPARALLEL +$(NOTPARALLEL): +do-distclean: distclean-stage1 +@endif gcc-bootstrap + # -------------------------------------- # Dependencies between different modules # -------------------------------------- @@ -1602,8 +1584,8 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss (define dep-maybe (lambda () (if (exist? "hard") "" "maybe-"))) - ;; dep-kind returns "normal" is the dependency is on an "install" target, - ;; or if the LHS module is not bootstrapped. It returns "bootstrap" for + ;; dep-kind returns "normal" if the dependency is on an "install" target, + ;; or if either module is not bootstrapped. It returns "bootstrap" for ;; configure or build dependencies between bootstrapped modules; it returns ;; "prebootstrap" for configure or build dependencies of bootstrapped ;; modules on a build module (e.g. all-gcc on all-build-bison). All this @@ -1615,7 +1597,8 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss (if (or (= (dep-subtarget "on") "install-") (=* (dep-module "on") "target-") - (not (hash-ref boot-modules (dep-module "module")))) + (not (hash-ref boot-modules (dep-module "module"))) + (not (hash-ref boot-modules (dep-module "on")))) "normal" "bootstrap"))))