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

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index b33117a..3437a76 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -109,14 +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" >> $@
@@ -468,6 +462,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)