From 9bd6112c5a2585eb58564f583ad84da87fe27d3a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 17 Nov 2006 10:31:47 +0000 Subject: re PR ada/29802 (wrong directory in makefile for ada and libada when srcdir=.) 2006-11-16 Paolo Bonzini * Makefile.tpl (clean-target-libgcc): Test for gcc Makefile presence. (unstage): Test for stage_last presence. PR bootstrap/29802 * Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Add HOST_SUBDIR in STAGE_PREFIX. * Makefile.in: Regenerate. libada: 2006-11-16 Paolo Bonzini PR bootstrap/29802 * configure.ac: Call GCC_TOPLEV_SUBDIRS. * configure: Regenerate. * Makefile.in: Replace host_subdir. From-SVN: r118927 --- Makefile.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.tpl') diff --git a/Makefile.tpl b/Makefile.tpl index 5ce38ab..7e9cb79 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -591,7 +591,7 @@ realclean: maintainer-clean # Extra dependency for clean-target, owing to the mixed nature of gcc. clean-target: clean-target-libgcc clean-target-libgcc: - test ! -d gcc || (cd gcc && $(MAKE) $@) + if test -f gcc/Makefile; then cd gcc && $(MAKE) $@; else :; fi # Check target. @@ -1215,7 +1215,7 @@ stage = : current_stage = "" @if gcc-bootstrap -unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start +unstage = if [ -f stage_last ]; then [ -f stage_current ] || $(MAKE) `cat stage_last`-start || exit 1; else :; fi stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi current_stage = "`cat stage_current 2> /dev/null`" @endif gcc-bootstrap @@ -1258,7 +1258,7 @@ objext = .o # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/prev-gcc/ \ + STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \ CFLAGS="$(BOOT_CFLAGS)" \ LIBCFLAGS="$(BOOT_CFLAGS)" \ LDFLAGS="$(BOOT_LDFLAGS)" \ -- cgit v1.1