X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-pkg%2FMakefile;h=61e4893d400b37154c9c3c42784d5f1fd2b652f3;hb=4d7ecf304ab398c4aed110822cd934cb6dc071e3;hp=47b4ebed36d4bf2a917405666544dd96c0fe28c5;hpb=e58f0bfbdc3d8459e9546aad293ed46aec5ca66b;p=ghc-hetmet.git

diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index 47b4ebe..61e4893 100644
--- a/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -1,105 +1,19 @@
-TOP=../..
-include $(TOP)/mk/boilerplate.mk
-
-# -----------------------------------------------------------------------------
-# ghc-pkg.bin
-
-SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
-
-# This causes libghccompat.a to be used:
-include $(GHC_COMPAT_DIR)/compat.mk
-
-SRC_HC_OPTS += $(PACKAGE_CABAL)
-
-# 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) $(GhcStage1HcOpts)
-
-# 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
-# ($libexecdir/ghc-pkg.bin) so that it can find package.conf.
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-HS_PROG           = ghc-pkg.exe
-INSTALL_PROGS    += $(HS_PROG)
-else
-HS_PROG           = ghc-pkg.bin
-INSTALL_LIBEXECS += $(HS_PROG)
-endif
-
-# -----------------------------------------------------------------------------
-# Create the Version.hs file
-
-VERSION_HS = Version.hs
-EXTRA_SRCS += $(VERSION_HS)
-
-boot :: $(VERSION_HS)
 
-Version.hs : Makefile $(TOP)/mk/config.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 and ghc-pkg-inplace scripts
-
-# ghc-pkg-inplace used to be either a /bin/sh script, or a .bat script
-# on Windows.  It is now a real binary, compiled from a tiny .hs
-# file.  The problem with using scripts here was that the .bat script
-# cannot be executed by /bin/sh on MSYS (it can on Cygwin), but the
-# /bin/sh script cannot be executed by Cabal.  So we would have needed
-# both.  A single binary is therefore simpler.
-
-INPLACE_HS=ghc-pkg-inplace.hs
-INPLACE_PROG=ghc-pkg-inplace
-EXCLUDED_SRCS+=$(INPLACE_HS)
-
-# FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that
-# will go wrong when we use it in a Haskell string below.
-TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM))
-
-$(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
-	echo "import System.Cmd; import System.Environment; import System.Exit" > $@
-	echo "main = do args <- getArgs; rawSystem \"$(TOP_ABS)/$(GHC_PKG_DIR_REL)/$(HS_PROG)\" (\"--global-conf\":\"$(TOP_ABS)/driver/package.conf.inplace\":args) >>= exitWith" >> $@
-
-$(INPLACE_PROG): $(INPLACE_HS)
-	$(GHC) --make $< -o $@
-
-all :: $(INPLACE_PROG)
-
-CLEAN_FILES += $(INPLACE_HS) $(INPLACE_PROG)
+TOP=../..
+ENABLE_SHELL_WRAPPERS = YES
+EXTRA_CLEAN = Version.hs
 
-ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-LINK = ghc-pkg
-LINK_TARGET = $(LINK)-$(ProjectVersion)
-INSTALLED_SCRIPT=$(bindir)/$(LINK_TARGET)
-install::
-	$(RM) -f $(INSTALLED_SCRIPT)
-	echo "#!$(SHELL)"                                           >> $(INSTALLED_SCRIPT)
-	echo "GHCPKGBIN=$(libexecdir)/$(HS_PROG)"                   >> $(INSTALLED_SCRIPT)
-	echo "PKGCONF=$(libdir)/package.conf"                       >> $(INSTALLED_SCRIPT)
-	echo 'exec $$GHCPKGBIN --global-conf $$PKGCONF $${1+"$$@"}' >> $(INSTALLED_SCRIPT)
-	$(EXECUTABLE_FILE) $(INSTALLED_SCRIPT)
-endif
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal.mk
 
-# ghc-pkg is needed to boot in rts/ and library dirs
-# Do a recursive 'make all' after generating dependencies, because this
-# will work with 'make -j'.
-ifneq "$(BootingFromHc)" "YES"
-boot :: depend
-	$(MAKE) all
-endif
+with-bootstrapping-compiler: Version.hs
+with-stage-1: Version.hs
 
-binary-dist:
-	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/ghc-pkg
-	$(INSTALL_DATA)    Makefile   $(BIN_DIST_DIR)/utils/ghc-pkg/
-	$(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/ghc-pkg/
+Version.hs: Makefile $(TOP)/mk/config.mk
+	$(RM) -f 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
 
-include $(TOP)/mk/target.mk