X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=30ec2860139cf9692ea934c0d4a58475b008e71f;hb=a1e077c2ecbab045b748941e5bca25c2a677eb55;hp=8c52e97d967b9bcd86e60a9c001be72da0db5a17;hpb=71c45d66d1346435187512aebd2df7ef041b2aa4;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 8c52e97..30ec286 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -257,8 +257,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@echo "cLdIsGNULd            = \"$(LdIsGNULd)\"" >> $(CONFIG_HS)
 	@echo "cLD_X		     :: String" >> $(CONFIG_HS)
 	@echo "cLD_X		     = \"$(LD_X)\"" >> $(CONFIG_HS)
-	@echo "cPROJECT_DIR          :: String" >> $(CONFIG_HS)
-	@echo "cPROJECT_DIR          = \"$(PROJECT_DIR)\"" >> $(CONFIG_HS)
 	@echo "cGHC_DRIVER_DIR_REL   :: String" >> $(CONFIG_HS)
 	@echo "cGHC_DRIVER_DIR_REL   = \"$(GHC_DRIVER_DIR_REL)\"" >> $(CONFIG_HS)
 	@echo "cGHC_TOUCHY_PGM       :: String" >> $(CONFIG_HS)
@@ -617,7 +615,7 @@ endif
 SRC_HC_OPTS += -ignore-package lang
 
 SRC_CC_OPTS += -Iparser -I. -O
-SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
+SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
 SRC_HC_OPTS += -H16M
 
 ifeq "$(BootingFromHc)" "YES"
@@ -628,7 +626,7 @@ endif
 #	The standard suffix rule for compiling a Haskell file
 #	adds these flags to the command line
 
-# There used to be a -no-recomp flag on PrimOp, but why?
+# There used to be a -fforce-recomp flag on PrimOp, but why?
 # It's an expensive module to recompile!
 prelude/PrimOp_HC_OPTS 		= -H80m
 
@@ -639,8 +637,8 @@ parser/Parser_HC_OPTS 		+= -fno-warn-incomplete-patterns
 # Careful optimisation of the parser: we don't want to throw everything
 # at it, because that takes too long and doesn't buy much, but we do want
 # to inline certain key external functions, so we instruct GHC not to
-# throw away inlinings as it would normally do in -Onot mode:
-parser/Parser_HC_OPTS		+= -Onot -fno-ignore-interface-pragmas
+# throw away inlinings as it would normally do in -O0 mode:
+parser/Parser_HC_OPTS		+= -O0 -fno-ignore-interface-pragmas
 
 ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS 		=  -O2 -O2-for-C
@@ -1044,7 +1042,7 @@ endif
 # careful to recompile stuff you need if you reconfigure or change HsVersions.h.
 
 # Aargh, these don't work properly anyway, because GHC's recompilation checker
-# just reports "compilation NOT required".  Do we have to add -no-recomp for each
+# just reports "compilation NOT required".  Do we have to add -fforce-recomp for each
 # of these .hs files?  I haven't done anything about this yet.
 
 $(odir)/codeGen/Bitmap.$(way_)o		:  ../includes/MachDeps.h