diff options
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 65e5295883d..01c3cf6d89b 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -255,6 +255,8 @@ 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_ADAFLAGS= +BOOT_LDFLAGS= BISON = @BISON@ YACC = @YACC@ @@ -429,6 +431,7 @@ X11_FLAGS_TO_PASS = \ # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The # COMPILER_ prefixed variables are not passed down so we expand them here. EXTRA_TARGET_FLAGS = \ + 'ADAFLAGS=$$(ADAFLAGS_FOR_TARGET)' \ 'AR=$$(AR_FOR_TARGET)' \ 'AS=$(COMPILER_AS_FOR_TARGET)' \ 'CC=$$(CC_FOR_TARGET)' \ @@ -1212,7 +1215,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 @@ -1252,6 +1255,8 @@ POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ STAGE_PREFIX=$$r/prev-gcc/ \ CFLAGS="$(BOOT_CFLAGS)" \ + ADAFLAGS="$(BOOT_ADAFLAGS)" \ + LDFLAGS="$(BOOT_LDFLAGS)" \ ADAC="\$$(CC)" # For stage 1: @@ -1319,7 +1324,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+] |