Fix some argument names

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

diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index b27a2f1..5afb448 100644 (file)
--- a/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -15,16 +15,8 @@ endif
 
 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)
-
 ifeq "$(Windows)" "NO"
 SRC_HC_OPTS += -package unix
 endif
@@ -33,6 +25,8 @@ ifeq "$(ghc_ge_607)" "YES"
 SRC_HC_OPTS += -package containers
 endif
 
+SRC_HC_OPTS += -package Cabal
+
 # 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
@@ -46,12 +40,18 @@ NOGLOB_O          = CRT_noglob.o
 else
 
 # We have two version: the inplace version compiled by the bootstrap compiler
-#   and the install version compiled by the stage 1 compiler
+# and the install version compiled by the stage 1 compiler.
+# When creating or using bindists we always want the final binary, as built
+# by the stage 1 compiler.
+ifeq "$(DOING_BIN_DIST)" "YES"
+HS_PROG           = ghc-pkg.bin
+else
 ifeq "$(stage)" "2"
 HS_PROG           = ghc-pkg.bin
 else
 HS_PROG           = ghc-pkg-inplace.bin
 endif
+endif
 INSTALL_LIBEXECS += $(HS_PROG)
 NOGLOB_O         =