Remove unused cEnableWin32DLLs

[ghc-hetmet.git] / compiler / ghc.mk

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index c237df7..463ac3e 100644 (file)
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -109,12 +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" >> $@
@@ -395,7 +391,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 +419,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
@@ -466,6 +464,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)