Another round of External Core fixes

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

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 0e3ce12..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,10 +39,14 @@ endif
 
 endif
 
-ifneq "$(findstring thr, $(GhcRTSWays))" ""
-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)
@@ -52,4 +58,6 @@ 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