X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2Fghc-pkg%2FMakefile;h=d513a91b1c78b7ed3cdbd4dfcccc1b80bddd9780;hb=7f24ae51ed36c5c0308a2d0de23e243f32a0043c;hp=cda1fbb1543882d3d7f21cbf77ce74d225783bfa;hpb=60f2f165f05ff4a6bef9bc73dc243ab8150826fc;p=ghc-hetmet.git

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index cda1fbb..d513a91 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -9,18 +9,15 @@ INSTALLING=1
 # -----------------------------------------------------------------------------
 # ghc-pkg.bin
 
-ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
-
 SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
-SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries
-SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
-SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
+# This causes libghccompat.a to be used:
+include $(GHC_LIB_COMPAT_DIR)/compat.mk
 
-ifeq "$(Windows)" "YES"
-# not very nice, but required for -lghccompat on Windows
-SRC_LD_OPTS += -lshell32
-endif
+# This is required because libghccompat.a must be built with
+# $(GhcHcOpts) because it is linked to the compiler, and hence
+# we must also build with $(GhcHcOpts) here:
+SRC_HC_OPTS += $(GhcHcOpts)
 
 ifeq "$(ghc_ge_504)" "NO"
 SRC_HC_OPTS +=  -package lang -package util -package text
@@ -50,10 +47,13 @@ Version.hs : Makefile $(TOP)/mk/version.mk
 	@$(RM) -f $(VERSION_HS)
 	@echo "Creating $(VERSION_HS) ... "
 	@echo "module Version where" >>$(VERSION_HS)
+	@echo "version, targetOS, targetARCH :: String" >>$(VERSION_HS)
 	@echo "version    = \"$(ProjectVersion)\"" >> $(VERSION_HS)
 	@echo "targetOS   = \"$(TargetOS_CPP)\"" >> $(VERSION_HS)
 	@echo "targetARCH = \"$(TargetArch_CPP)\"" >> $(VERSION_HS)
 
+DIST_CLEAN_FILES += $(VERSION_HS)
+
 # -----------------------------------------------------------------------------
 # ghc-pkg script