From 9fde8e7e6e08680f2c6addc5f1ed2232db71b604 Mon Sep 17 00:00:00 2001
From: "andy@galois.com" <unknown>
Date: Wed, 27 Jun 2007 06:07:21 +0000
Subject: [PATCH] Fixing Makefile hpc to use compat

---
 utils/hpc/Makefile |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile
index f8eb9e5..46fd693 100644
--- a/utils/hpc/Makefile
+++ b/utils/hpc/Makefile
@@ -5,12 +5,13 @@ HS_PROG		= hpc$(exeext)
 INSTALL_PROGS  += $(HS_PROG)
 HPC_LIB         = $(TOP)/libraries/hpc
 
-SRCS += Trace/Hpc/Mix.hs Trace/Hpc/Tix.hs Trace/Hpc/Util.hs
+# This causes libghccompat.a to be used:
+include $(GHC_COMPAT_DIR)/compat.mk
 
-# 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)/$@ $@
+# 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)
 
 binary-dist:
 	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/hpc
-- 
1.7.10.4