This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Makefile.in: Simplify recursive make callings.
- From: Kelley Cook <kcook34 at ford dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 05 Sep 2003 11:48:55 -0400
- Subject: Makefile.in: Simplify recursive make callings.
- Hop-count: 1
- Reply-to: Kelley Cook <kelleycook at wideopenwest dot com>
This patch simply defines a new variable within GCC's Makefile.in
REMAKE=$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)"
and replaces all of those calls with $(REMAKE).
Bootstrapped on i686-pc-cygwin (before recent enabling -funit-at-a-time
at -O2, which seems to have killed cygwin) and then restrapped with a
BOOT_CFLAGS="-march=pentium4" for good measure.
OK to install?
Kelley Cook
2003-09-05 Kelley Cook <kelleycook@wideopenwest.com>
* Makefile.in: Define $REMAKE to be $MAKE with LANGUAGES & BOOT_CFLAGS
and use it throughout.
*** Makefile.in.orig Fri Sep 5 11:24:36 2003
--- Makefile.in Fri Sep 5 11:18:59 2003
*************** STAMP = echo timestamp >
*** 223,228 ****
--- 223,229 ----
# Make sure the $(MAKE) variable is defined.
@SET_MAKE@
+ REMAKE=$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)"
# --------
# UNSORTED
*************** unstage1 unstage2 unstage3 unstage4 unst
*** 3468,3489 ****
echo $${stage}_build > stage_last
restage1: unstage1
! $(MAKE) stage1_build
restage2: unstage2
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage2_build
restage3: unstage3
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage3_build
restage4: unstage4
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage4_build
restageprofile: unstageprofile
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stageprofile_build
restagefeedback: unstagefeedback
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stagefeedback_build
# Bubble up a bugfix through all the stages. Primarily useful for fixing
# bugs that cause the compiler to crash while building stage 2.
--- 3469,3490 ----
echo $${stage}_build > stage_last
restage1: unstage1
! $(REMAKE) stage1_build
restage2: unstage2
! $(REMAKE) stage2_build
restage3: unstage3
! $(REMAKE) stage3_build
restage4: unstage4
! $(REMAKE) stage4_build
restageprofile: unstageprofile
! $(REMAKE) stageprofile_build
restagefeedback: unstagefeedback
! $(REMAKE) stagefeedback_build
# Bubble up a bugfix through all the stages. Primarily useful for fixing
# bugs that cause the compiler to crash while building stage 2.
*************** bubblestrap:
*** 3491,3521 ****
if test -f stage_last; then \
LAST=`sed -e 's/_build//' < stage_last`; \
if test "$$LAST" != "stage1"; then \
! $(MAKE) $$LAST; \
$(STAMP) $${LAST}_copy; \
fi; \
fi
if test -f stage1_copy; then $(MAKE) unstage1; fi
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage1_copy
if test -f stage2_copy; then $(MAKE) unstage2; fi
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage2_copy
if test -f stage3_copy; then $(MAKE) unstage3; fi
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage3_build
if test -f stage4_copy; then \
! $(MAKE) stage3_copy; $(MAKE) unstage4; \
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage4_build || exit 1; \
fi
quickstrap:
if test -f stage_last ; then \
! LAST=`cat stage_last`; rm $$LAST; $(MAKE) BOOT_CFLAGS="$(BOOT_CFLAGS)" LANGUAGES="$(LANGUAGES)" $$LAST; \
else \
! $(MAKE) stage1_build; \
fi
cleanstrap:
-$(MAKE) clean
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" bootstrap
unstrap:
-rm -rf stage[234]*
--- 3492,3522 ----
if test -f stage_last; then \
LAST=`sed -e 's/_build//' < stage_last`; \
if test "$$LAST" != "stage1"; then \
! $(REMAKE) $$LAST; \
$(STAMP) $${LAST}_copy; \
fi; \
fi
if test -f stage1_copy; then $(MAKE) unstage1; fi
! $(REMAKE) stage1_copy
if test -f stage2_copy; then $(MAKE) unstage2; fi
! $(REMAKE) stage2_copy
if test -f stage3_copy; then $(MAKE) unstage3; fi
! $(REMAKE) stage3_build
if test -f stage4_copy; then \
! $(REMAKE) stage3_copy; $(MAKE) unstage4; \
! $(REMAKE) stage4_build || exit 1; \
fi
quickstrap:
if test -f stage_last ; then \
! LAST=`cat stage_last`; rm $$LAST; $(REMAKE) $$LAST; \
else \
! $(REMAKE) stage1_build; \
fi
cleanstrap:
-$(MAKE) clean
! $(REMAKE) bootstrap
unstrap:
-rm -rf stage[234]*
*************** unstrap:
*** 3526,3532 ****
# not from scratch.
restrap:
$(MAKE) unstrap
! $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" bootstrap
# Compare the object files in the current directory with those in the
# stage2 directory.
--- 3527,3533 ----
# not from scratch.
restrap:
$(MAKE) unstrap
! $(REMAKE) bootstrap
# Compare the object files in the current directory with those in the
# stage2 directory.