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

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index b6592f2..48554db 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)
@@ -107,18 +109,8 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
 	@echo "cGHC_SYSMAN_PGM       = \"$(GHC_SYSMAN)\"" >> $@
 	@echo "cGHC_SYSMAN_DIR       :: String" >> $@
 	@echo "cGHC_SYSMAN_DIR       = \"$(GHC_SYSMAN_DIR)\"" >> $@
-	@echo "cGHC_CP               :: String" >> $@
-	@echo "cGHC_CP               = \"$(GHC_CP)\"" >> $@
 	@echo "cGHC_PERL             :: String" >> $@
 	@echo "cGHC_PERL             = \"$(GHC_PERL)\"" >> $@
-	@echo "cEnableWin32DLLs      :: String" >> $@
-	@echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $@
-	@echo "cCONTEXT_DIFF         :: String" >> $@
-	@echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> $@
-	@echo "cUSER_WAY_NAMES       :: String" >> $@
-	@echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $@
-	@echo "cUSER_WAY_OPTS        :: String" >> $@
-	@echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $@
 	@echo "cDEFAULT_TMPDIR       :: String" >> $@
 	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $@
 	@echo "cRelocatableBuild     :: Bool"                 >> $@
@@ -393,7 +385,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 +413,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
@@ -464,6 +458,9 @@ ifeq "$(stage)" "3"
 $(eval $(call build-package,compiler,stage3,2))
 endif
 
+compiler_stage2_TAGS_HC_OPTS = -package ghc
+$(eval $(call tags-package,compiler,stage2))
+
 $(compiler_stage1_depfile_haskell) : compiler/stage1/$(PLATFORM_H)
 $(compiler_stage2_depfile_haskell) : compiler/stage2/$(PLATFORM_H)
 $(compiler_stage3_depfile_haskell) : compiler/stage3/$(PLATFORM_H)