X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=c96b6adc6e40c8062297b52a0aa4ef4aa592a30c;hb=e8b2fe5550ee87ee6d6dce1aaffa50558da6f8e3;hp=958e96c2823dda9972778a6b41a0b1933649f41e;hpb=710316dfc1ef5c9ef378ebfd8de96b3347aec63f;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 958e96c..c96b6ad 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -18,6 +18,7 @@
 TOP = ..
 
 # Use GHC for compiling C bits (NB. must be before boilerplate include)
+# NB. this requires BootingFromHc to be set on the make command line!
 #
 ifneq "$(BootingFromHc)" "YES"
 UseGhcForCc = YES
@@ -108,7 +109,7 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 	done
 else
 	for i in */*hi-boot*; do \
-	    $(LN_S) -f ../../$$i stage$(stage)/$$i; \
+	    $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \
 	done
 endif
 
@@ -182,7 +183,7 @@ boot :: $(CONFIG_HS)
 
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@$(RM) -f $(CONFIG_HS)
-	@echo -n "Creating $(CONFIG_HS) ... "
+	@echo "Creating $(CONFIG_HS) ... "
 	@echo "module Config where" >>$(CONFIG_HS)
 	@echo "cProjectName          = \"$(ProjectName)\"" >> $(CONFIG_HS)
 	@echo "cProjectVersion       = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@@ -380,8 +381,14 @@ utils/Binary_HC_OPTS		+= -fvia-C
 endif
 
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
-ghci/ByteCodeItbls_HC_OPTS	= -fvia-C
-ghci/ByteCodeLink_HC_OPTS	= -fvia-C -monly-3-regs
+ghci/ByteCodeItbls_HC_OPTS	+= -fvia-C
+ghci/ByteCodeLink_HC_OPTS	+= -fvia-C -monly-3-regs
+
+# BinIface and Binary take ages to both compile and run if you don's use -O
+main/BinIface_HC_OPTS		+= -O
+utils/Binary_HC_OPTS		+= -O
+utils/FastMutInt_HC_OPTS	+= -O
+
 
 # CSE interacts badly with top-level IORefs (reportedly in DriverState and
 # DriverMkDepend), causing some of them to be commoned up.  We have a fix for
@@ -474,7 +481,7 @@ primop-usage.hs-incl: prelude/primops.txt
 # ----------------------------------------------------------------------------
 #		Parsers/lexers
 
-SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS  $(GHC_HAPPY_OPTS)
+SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS
 
 #-----------------------------------------------------------------------------
 # 		Linking
@@ -515,16 +522,45 @@ endif
 # ----------------------------------------------------------------------------
 # profiling.
 
-# rename/Rename_HC_OPTS += -auto-all
-# rename/RnEnv_HC_OPTS += -auto-all
-# rename/RnHiFiles_HC_OPTS += -auto-all
-# rename/RnIfaces_HC_OPTS += -auto-all
-# rename/RnSource_HC_OPTS += -auto-all
-# rename/RnBinds_HC_OPTS += -auto-all
-# rename/RnExpr_HC_OPTS += -auto-all
-# rename/RnHsSyn_HC_OPTS += -auto-all
-# rename/RnNames_HC_OPTS += -auto-all
-# rename/RnTypes_HC_OPTS += -auto-all
+rename/RnBinds_HC_OPTS += -auto-all
+rename/RnEnv_HC_OPTS += -auto-all
+rename/RnExpr_HC_OPTS += -auto-all
+rename/RnHiFiles_HC_OPTS += -auto-all
+rename/RnHsSyn_HC_OPTS += -auto-all
+rename/Rename_HC_OPTS += -auto-all
+rename/RnIfaces_HC_OPTS += -auto-all
+rename/RnNames_HC_OPTS += -auto-all
+rename/RnSource_HC_OPTS += -auto-all
+rename/RnTypes_HC_OPTS += -auto-all
+
+typecheck/Inst_HC_OPTS += -auto-all
+typecheck/TcBinds_HC_OPTS += -auto-all
+typecheck/TcClassDcl_HC_OPTS += -auto-all
+typecheck/TcDefaults_HC_OPTS += -auto-all
+typecheck/TcDeriv_HC_OPTS += -auto-all
+typecheck/TcEnv_HC_OPTS += -auto-all
+typecheck/TcExpr_HC_OPTS += -auto-all
+typecheck/TcForeign_HC_OPTS += -auto-all
+typecheck/TcGenDeriv_HC_OPTS += -auto-all
+typecheck/TcHsSyn_HC_OPTS += -auto-all
+typecheck/TcIfaceSig_HC_OPTS += -auto-all
+typecheck/TcInstDcls_HC_OPTS += -auto-all
+typecheck/TcMatches_HC_OPTS += -auto-all
+typecheck/TcMonoType_HC_OPTS += -auto-all
+typecheck/TcMType_HC_OPTS += -auto-all
+typecheck/TcPat_HC_OPTS += -auto-all
+typecheck/TcRnDriver_HC_OPTS += -auto-all
+#typecheck/TcRnMonad_HC_OPTS += -auto-all
+#typecheck/TcRnTypes_HC_OPTS += -auto-all
+typecheck/TcRules_HC_OPTS += -auto-all
+typecheck/TcSimplify_HC_OPTS += -auto-all
+typecheck/TcSplice_HC_OPTS += -auto-all
+typecheck/TcTyClsDecls_HC_OPTS += -auto-all
+typecheck/TcTyDecls_HC_OPTS += -auto-all
+typecheck/TcType_HC_OPTS += -auto-all
+typecheck/TcUnify_HC_OPTS += -auto-all
+
+absCSyn/PprAbsC_HC_OPTS += -auto-all
 
 #-----------------------------------------------------------------------------
 # 		clean