projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-07-28 16:16:07 by moran]
[ghc-hetmet.git]
/
ghc
/
rts
/
Makefile
diff --git
a/ghc/rts/Makefile
b/ghc/rts/Makefile
index
8b344b0
..
b210309
100644
(file)
--- 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.
# 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
include $(TOP)/mk/boilerplate.mk
@@
-110,11
+110,6
@@
ifeq "$(way)" "mp"
SRC_HC_OPTS += -I$$PVM_ROOT/include
endif
SRC_HC_OPTS += -I$$PVM_ROOT/include
endif
-ifeq "$(BootingFromHc)" "YES"
-# use the normal $(CC) when booting from .hc files
-SRC_CC_OPTS += $(HC_OPTS)
-endif
-
# Currently, you only get 'threads support' in the normal
# way.
ifeq "$(GhcRtsThreaded)" "YES"
# Currently, you only get 'threads support' in the normal
# way.
ifeq "$(GhcRtsThreaded)" "YES"
@@
-175,12
+170,11
@@
SRC_MKDEPENDC_OPTS += -I. -I../includes
AUTO_APPLY = AutoApply.hc
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) >$@
$(AUTO_APPLY): $(GHC_GENAPPLY)
@$(RM) $@
$(GHC_GENAPPLY) >$@
+endif
EXTRA_SRCS += $(AUTO_APPLY)
EXTRA_SRCS += $(AUTO_APPLY)