summaryrefslogtreecommitdiff
path: root/utils/hpc
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-07-18 17:00:47 +0000
committerIan Lynagh <igloo@earth.li>2008-07-18 17:00:47 +0000
commit763ff8ece976a1de1093cd35f82393e13aa7db70 (patch)
tree620053660e1b1b340e93d8cfe30847c49f764267 /utils/hpc
parentd8ee31a38b280e69c0b19e19992fc1df9c84c08c (diff)
downloadhaskell-763ff8ece976a1de1093cd35f82393e13aa7db70.tar.gz
Build hpc with Cabal
Diffstat (limited to 'utils/hpc')
-rw-r--r--utils/hpc/Makefile33
-rw-r--r--utils/hpc/hpc-bin.cabal30
2 files changed, 32 insertions, 31 deletions
diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile
index ac1bf22a9a..0f34de9174 100644
--- a/utils/hpc/Makefile
+++ b/utils/hpc/Makefile
@@ -1,34 +1,5 @@
+
TOP=../..
include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal.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
-
-SRC_HC_OPTS += -package hpc -cpp
-
-ifeq "$(ghc_ge_607)" "YES"
-SRC_HC_OPTS += -package containers
-endif
-
-binary-dist:
- $(INSTALL_DIR) $(BIN_DIST_DIR)/utils/hpc
- $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/hpc/
- $(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/hpc/
-
-include $(TOP)/mk/target.mk
diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal
new file mode 100644
index 0000000000..f980e4db62
--- /dev/null
+++ b/utils/hpc/hpc-bin.cabal
@@ -0,0 +1,30 @@
+Name: hpc-bin
+-- XXX version number:
+Version: 0.67
+Copyright: XXX
+License: BSD3
+-- XXX License-File: LICENSE
+Author: XXX
+Maintainer: XXX
+Synopsis: XXX
+Description:
+ XXX
+Category: Development
+build-type: Simple
+cabal-version: >=1.2
+
+Flag base3
+ Description: Choose the new smaller, split-up base package.
+
+Executable hpc
+ Main-Is: Hpc.hs
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4,
+ directory >= 1 && < 1.1,
+ containers >= 0.1 && < 0.2,
+ array >= 0.1 && < 0.2
+ else
+ Build-Depends: base < 3
+ Build-Depends: haskell98, hpc
+ Extensions: CPP
+