Another round of External Core fixes

[ghc-hetmet.git] / compiler / Makefile.ghcbin

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 0f91a53..46dd5dc 100644 (file)
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -17,6 +17,8 @@ ifeq "$(stage)" "3"
 HC=$(GHC_STAGE2)
 endif
 
+EXCLUDED_C_SRCS += ghc-inplace.c
+
 SRC_HC_OPTS += -package ghc
 SRC_HC_OPTS += -Istage$(stage)
 SRC_HC_OPTS += \
@@ -37,14 +39,25 @@ endif
 
 endif
 
-ifneq "$(GhcNotThreaded)" "YES"
+ifeq "$(GhcThreaded)" "YES"
 SRC_HC_OPTS += -threaded
 endif
+ifeq "$(GhcProfiled)" "YES"
+SRC_HC_OPTS += -prof
+endif
+ifeq "$(GhcDebugged)" "YES"
+SRC_LD_OPTS += -debug
+endif
 
 odir=stage$(stage)
 
 HS_SRCS = main/Main.hs
 HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
 $(odir)/main/Main.o : libHSghc$(_way).a
+SRC_HC_OPTS += -fforce-recomp
+# can't rely on GHC's recompilation checking here, because it won't spot 
+# changes in the ghc package.
+
+WAYS=$(GhcCompilerWays)
 
 include $(TOP)/mk/target.mk