summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2005-12-19 17:02:00 +0000
committerbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2005-12-19 17:02:00 +0000
commit9d44a80215cae63598a3982edd1a67d23bd9f725 (patch)
treedbc4d0e6c6c37767de48ab0e18bb5be443b2a8e2 /Makefile.in
parent1d13311084125d7622e74f9d2118e7ff704818b6 (diff)
downloadgcc-9d44a80215cae63598a3982edd1a67d23bd9f725.tar.gz
2005-12-19 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Select appropriate fragments for PowerPC/AIX. * configure: Regenerate. * Makefile.def (flags_to_pass): Add ADAFLAGS, BOOT_ADAFLAGS, BOOT_CFLAGS, BOOT_LDFLAGS. * Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Handle BOOT_ADAFLAGS, BOOT_CFLAGS, BOOT_LDFLAGS. (TARGET_FLAGS_TO_PASS): Handle ADAFLAGS_FOR_TARGET. (stage[+id+]-bubble): Pass flags recursively to the comparison target. (stage): Fail if we cannot complete the work. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108793 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in16
1 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index ad5033cf2c7..e413718e7af 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -252,6 +252,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@
@@ -431,12 +433,17 @@ BASE_FLAGS_TO_PASS = \
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
"SHELL=$(SHELL)" \
"YACC=$(YACC)" \
+ "ADAFLAGS=$(ADAFLAGS)" \
"AR_FLAGS=$(AR_FLAGS)" \
+ "BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)" \
+ "BOOT_CFLAGS=$(BOOT_CFLAGS)" \
+ "BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \
"CFLAGS=$(CFLAGS)" \
"CXXFLAGS=$(CXXFLAGS)" \
"LDFLAGS=$(LDFLAGS)" \
"LIBCFLAGS=$(LIBCFLAGS)" \
"LIBCXXFLAGS=$(LIBCXXFLAGS)" \
+ "ADAFLAGS_FOR_TARGET=$(ADAFLAGS_FOR_TARGET)" \
"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
@@ -497,6 +504,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)' \
@@ -35667,7 +35675,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
@@ -35707,6 +35715,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:
@@ -36363,7 +36373,7 @@ stage3-bubble:: stage2-bubble
$(MAKE) stage3-start; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
fi
- $(MAKE) compare
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare
.PHONY: all-stage3 clean-stage3
do-clean: clean-stage3
@@ -36647,7 +36657,7 @@ stage4-bubble:: stage3-bubble
$(MAKE) stage4-start; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
fi
- $(MAKE) compare3
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
.PHONY: all-stage4 clean-stage4
do-clean: clean-stage4