Commit 5e9fd7ed authored by simonmar's avatar simonmar
Browse files

[project @ 2003-07-23 15:14:50 by simonmar]

- no need for hacky delayed setting of UseGhcForCc
- fix AutoApply.hc rule when BootingFromHc=YES
parent d891bb5c
...@@ -20,7 +20,7 @@ TOP=.. ...@@ -20,7 +20,7 @@ TOP=..
# set of suffix rules for compiling C code, using $(HC) rather than $(CC) # 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 # and prepending "-optc" to $(CC_OPTS). NB. must be done before including
# boilerplate.mk below. # boilerplate.mk below.
UseGhcForCc = $(shell if (test "x$(BootingFromHc)" = "xYES"); then echo NO; else echo YES; fi) UseGhcForCc = YES
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
...@@ -175,12 +175,11 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes ...@@ -175,12 +175,11 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
AUTO_APPLY = AutoApply.hc AUTO_APPLY = AutoApply.hc
gen_apply : GenApply.hs ifneq "$(BootingFromHc)" "YES"
$(GHC) -o $@ -I$(GHC_INCLUDE_DIR) GenApply.hs
$(AUTO_APPLY): $(GHC_GENAPPLY) $(AUTO_APPLY): $(GHC_GENAPPLY)
@$(RM) $@ @$(RM) $@
$(GHC_GENAPPLY) >$@ $(GHC_GENAPPLY) >$@
endif
EXTRA_SRCS += $(AUTO_APPLY) EXTRA_SRCS += $(AUTO_APPLY)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment