daily update

[deliverable/binutils-gdb.git] / Makefile.tpl

diff --git a/Makefile.tpl b/Makefile.tpl
index 8026730efd7ddf22b248638a4aea886ca6e19089..8b5b679cccc8d885801abd2e8e7dc31cc70ce30a 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -255,6 +255,7 @@ 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
+BOOT_LDFLAGS=
 
 BISON = @BISON@
 YACC = @YACC@
@@ -497,7 +498,6 @@ all:
        else \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
        fi
-       @: $(MAKE); $(stage)
 
 .PHONY: all-build
 all-build: [+
@@ -527,7 +527,6 @@ do-[+make_target+]:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \
          [+make_target+]-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: [+make_target+]-host
@@ -621,7 +620,6 @@ do-check:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
-       @: $(MAKE); $(stage)
 
 # Automated reporting of test results.
 
@@ -652,7 +650,6 @@ install:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
-       @: $(MAKE); $(stage)
 
 .PHONY: install-host-nogcc
 install-host-nogcc: [+
@@ -1216,7 +1213,7 @@ stage = :
 
 @if gcc-bootstrap
 unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
 @endif gcc-bootstrap
 
 .PHONY: unstage stage
@@ -1256,6 +1253,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
        CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
        STAGE_PREFIX=$$r/prev-gcc/ \
        CFLAGS="$(BOOT_CFLAGS)" \
+       LDFLAGS="$(BOOT_LDFLAGS)" \
        ADAC="\$$(CC)"
 
 # For stage 1:
@@ -1323,7 +1321,7 @@ stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +][+IF lean +]
          $(MAKE) stage[+id+]-start; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
        fi[+ IF compare-target +]
-       $(MAKE) [+compare-target+][+ ENDIF compare-target +]
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+compare-target+][+ ENDIF compare-target +]
 
 .PHONY: all-stage[+id+] clean-stage[+id+]
 do-clean: clean-stage[+id+]
@@ -1378,7 +1376,6 @@ do-clean: clean-stage[+id+]
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-       @: $(MAKE); $(stage)
 [+ ENDIF bootstrap-target +]
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap