X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=1c61494b188e70241cd31edaaa3405fde9db2fc7;hb=6ffa3d7122aa1e1e43850fd9754eb7585808c4ac;hp=c237df7a5c30143ad0d017044fcd6515bc975ad5;hpb=3a60f713e57c22c7357bec66bfcee6e8ddffee9a;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index c237df7..1c61494 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -109,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"                 >> $@
@@ -395,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)'
@@ -423,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
@@ -447,24 +439,26 @@ compiler_stage1_SplitObjs = NO
 compiler_stage2_SplitObjs = NO
 compiler_stage3_SplitObjs = NO
 
-# For now, bindists always use stage 2
-ifneq "$(BINDIST)" "YES"
-# stage 1 is enabled unless $(stage) is set to something other than 1
-ifeq "$(filter-out 1,$(stage))" ""
-$(eval $(call build-package,compiler,stage1,0))
+# if stage is set to something other than "1" or "", disable stage 1
+ifneq "$(filter-out 1,$(stage))" ""
+compiler_stage1_NOT_NEEDED = YES
 endif
+# if stage is set to something other than "2" or "", disable stage 2
+ifneq "$(filter-out 2,$(stage))" ""
+compiler_stage2_NOT_NEEDED = YES
 endif
-
-# stage 2 is enabled unless $(stage) is set to something other than 2
-ifeq "$(filter-out 2,$(stage))" ""
-$(eval $(call build-package,compiler,stage2,1))
+# stage 3 has to be requested explicitly with stage=3
+ifneq "$(stage)" "3"
+compiler_stage3_NOT_NEEDED = YES
 endif
+$(eval $(call build-package,compiler,stage1,0))
+$(eval $(call build-package,compiler,stage2,1))
+$(eval $(call build-package,compiler,stage3,2))
 
 ifneq "$(BINDIST)" "YES"
-# stage 3 has to be requested explicitly with stage=3
-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)
@@ -485,6 +479,13 @@ $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
 compiler/prelude/PrimOps_HC_OPTS += -fforce-recomp
 compiler/main/Constants_HC_OPTS  += -fforce-recomp
 
+# Workaround for #4003 in GHC 6.12.2.  It didn't happen in 6.12.1, and
+# will be fixed in 6.12.3.  Unfortunately we don't have a way to do
+# this for just stage1 in the build system.
+ifeq "$(GhcVersion)" "6.12.2"
+compiler/hsSyn/HsLit_HC_OPTS     += -fomit-interface-pragmas
+endif
+
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.