X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-pkg%2FMakefile;h=adce82949b77cbd5a38bd68eeb1f5a6074a21198;hb=eae65ca88fc09342e295874fb253f83775c61051;hp=383524a6fdcc4b5a04264beff9b8385f43019606;hpb=3e2748164e3e2e2dc21ca511959671f0f5f2e37f;p=ghc-hetmet.git

diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index 383524a..adce829 100644
--- a/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -4,6 +4,15 @@ include $(TOP)/mk/boilerplate.mk
 # -----------------------------------------------------------------------------
 # ghc-pkg.bin
 
+# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
+# these options in stage 1 we get a linker error if the bootstrap compiler is
+#  for a more recent OS version
+ifeq "$(stage)" "2"
+SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
+SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
+SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
+endif
+
 SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
 # This causes libghccompat.a to be used:
@@ -24,6 +33,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
@@ -37,12 +48,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	  =