X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile.ghcbin;h=379a725a283843cc92cbb5fc2bd8fe250c6f638c;hb=501db4a71483f4a6943008dd4c84e01fb9b55170;hp=0e3ce122cc093acc035f01f412f9b1cb16984a2a;hpb=d0ea71ec5000050ec22487029a9fcf6da76ee422;p=ghc-hetmet.git

diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin
index 0e3ce12..379a725 100644
--- a/compiler/Makefile.ghcbin
+++ b/compiler/Makefile.ghcbin
@@ -17,10 +17,13 @@ ifeq "$(stage)" "3"
 HC=$(GHC_STAGE2)
 endif
 
+EXCLUDED_C_SRCS += ghc-inplace.c
+
+SRC_HC_OPTS += -Wall
 SRC_HC_OPTS += -package ghc
 SRC_HC_OPTS += -Istage$(stage)
 SRC_HC_OPTS += \
-  -cpp -fglasgow-exts -fno-generics -Rghc-timing \
+  -cpp -fglasgow-exts -XNoGenerics -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser
 SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
 ifeq "$(TargetOS_CPP)" "openbsd"
@@ -37,10 +40,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)
@@ -48,8 +55,7 @@ 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