X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=b33117a61b2bf2aaa1abb45241a4bcb37b3b5bbf;hb=b64c79adfe3b06c3a1633b5bedde0a507e30247e;hp=b6592f24eff867f323eec00da83cc61ad2bc3999;hpb=f041c305d30b04fea6b3b784ca3cc5151a52e06d;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index b6592f2..b33117a 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -35,6 +35,8 @@ compiler_stage1_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES
 compiler_stage2_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES
 compiler_stage3_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES
 
+compiler_stage1_C_FILES_NODEPS = compiler/parser/cutils.c
+
 ifneq "$(BINDIST)" "YES"
 compiler/stage1/package-data.mk : $(compiler_CONFIG_HS)
 compiler/stage2/package-data.mk : $(compiler_CONFIG_HS)
@@ -393,7 +395,7 @@ compiler_stage3_CONFIGURE_OPTS := $(compiler_stage2_CONFIGURE_OPTS)
 compiler_stage1_CONFIGURE_OPTS += --ghc-option=-DSTAGE=1
 compiler_stage2_CONFIGURE_OPTS += --ghc-option=-DSTAGE=2
 compiler_stage3_CONFIGURE_OPTS += --ghc-option=-DSTAGE=3
-compiler_stage2_HADDOCK_OPTS += --haddock-option=--optghc=-DSTAGE=2
+compiler_stage2_HADDOCK_OPTS += --optghc=-DSTAGE=2
 
 compiler_stage1_CONFIGURE_OPTS += --ghc-options='$(GhcStage1HcOpts)'
 compiler_stage2_CONFIGURE_OPTS += --ghc-options='$(GhcStage2HcOpts)'
@@ -421,9 +423,11 @@ compiler_PACKAGE = ghc
 # below.
 # The ProjectPatchLevel > 20000000 iff it's a date. If it's e.g. 6.12.1
 # then we don't want to remove it
+ifneq "$(CLEANING)" "YES"
 ifeq "$(shell [ $(ProjectPatchLevel) -gt 20000000 ] && echo YES)" "YES"
 compiler_stage1_VERSION_MUNGED = YES
 endif
+endif
 
 ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES"
 define compiler_PACKAGE_MAGIC