From 5e9fd7ed27f970084b4795c5c4619c30a953174f Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 23 Jul 2003 15:14:50 +0000 Subject: [PATCH] [project @ 2003-07-23 15:14:50 by simonmar] - no need for hacky delayed setting of UseGhcForCc - fix AutoApply.hc rule when BootingFromHc=YES --- ghc/rts/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index 8b344b0..f46cf95 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -20,7 +20,7 @@ TOP=.. # set of suffix rules for compiling C code, using $(HC) rather than $(CC) # and prepending "-optc" to $(CC_OPTS). NB. must be done before including # boilerplate.mk below. -UseGhcForCc = $(shell if (test "x$(BootingFromHc)" = "xYES"); then echo NO; else echo YES; fi) +UseGhcForCc = YES include $(TOP)/mk/boilerplate.mk @@ -175,12 +175,11 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes AUTO_APPLY = AutoApply.hc -gen_apply : GenApply.hs - $(GHC) -o $@ -I$(GHC_INCLUDE_DIR) GenApply.hs - +ifneq "$(BootingFromHc)" "YES" $(AUTO_APPLY): $(GHC_GENAPPLY) @$(RM) $@ $(GHC_GENAPPLY) >$@ +endif EXTRA_SRCS += $(AUTO_APPLY) -- 1.7.10.4