X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhpc%2FMakefile;h=3b1d73105095957052309545b5ab105ebb36bc81;hb=1d47f08d196252b4ee5f4d5b5af2fb4945720762;hp=f8eb9e5b88a7a6c1371094ba39a39e58525226df;hpb=11d36d9f0256a3a3ef2934a776924f7c90afb6de;p=ghc-hetmet.git

diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile
index f8eb9e5..3b1d731 100644
--- a/utils/hpc/Makefile
+++ b/utils/hpc/Makefile
@@ -1,16 +1,31 @@
 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
 
-SRCS += Trace/Hpc/Mix.hs Trace/Hpc/Tix.hs Trace/Hpc/Util.hs
+include $(GHC_COMPAT_DIR)/compat.mk
+SRC_HC_OPTS += $(PACKAGE_HPC) -cpp 
 
-# workaround till we can force hpc to be built with stage-1.
-Trace/Hpc/%.hs: $(HPC_LIB)/Trace/Hpc/%.hs
-	mkdir -p Trace/Hpc
-	cp $(HPC_LIB)/$@ $@
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package containers
+endif
 
 binary-dist:
 	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/hpc