X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhpc%2FMakefile;h=3b1d73105095957052309545b5ab105ebb36bc81;hb=08ffc9074d79fd8117a090024068936a04360a17;hp=17065fa08156ec2ddfefd785e3bf0c471226d599;hpb=a5c802d4a27be911b6cbc23104bcff753867b55a;p=ghc-hetmet.git

diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile
index 17065fa..3b1d731 100644
--- a/utils/hpc/Makefile
+++ b/utils/hpc/Makefile
@@ -1,7 +1,22 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
+# 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
+
+# We have two version: the inplace version compiled by the bootstrap compiler
+#   and the install version compiled by the stage 1 compiler
+ifeq "$(stage)" "2"
 HS_PROG		= hpc$(exeext)
+else
+HS_PROG		= hpc-inplace$(exeext)
+endif
 INSTALL_PROGS  += $(HS_PROG)
 HPC_LIB         = $(TOP)/libraries/hpc