forkProcess(): watch out for ThreadRelocated

[ghc-hetmet.git] / ghc / utils / ghc-pkg / Makefile

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index 9d3b311..d513a91 100644 (file)
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -9,27 +9,20 @@ INSTALLING=1
 # -----------------------------------------------------------------------------
 # ghc-pkg.bin
 
-ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
-ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
-
 SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
-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
 endif
 
-ifeq "$(ghc_ge_603)" "YES"
-SRC_HC_OPTS +=  -package Cabal
-endif
-
 # On Windows, ghc-pkg is a standalone program
 # ($bindir/ghc-pkg.exe), whereas on Unix it needs a wrapper script
 # to pass the appropriate flag to the real binary
@@ -42,17 +35,6 @@ HS_PROG           = ghc-pkg.bin
 INSTALL_LIBEXECS += $(HS_PROG)
 endif
 
-# This is horrible.  We ought to be able to omit the entire directory
-# from mkDependHS.
-SRC_MKDEPENDHS_OPTS += \
-       -optdep--exclude-module=Compat.Directory \
-       -optdep--exclude-module=Distribution.Compat.ReadP \
-       -optdep--exclude-module=Distribution.Package \
-       -optdep--exclude-module=Distribution.InstalledPackageInfo \
-       -optdep--exclude-module=Distribution.Package \
-       -optdep--exclude-module=Distribution.License \
-       -optdep--exclude-module=Distribution.Version
-
 # -----------------------------------------------------------------------------=
 # Create the Version.hs file
 
@@ -65,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