summaryrefslogtreecommitdiff
path: root/utils/runghc
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-07-18 16:53:17 +0000
committerIan Lynagh <igloo@earth.li>2008-07-18 16:53:17 +0000
commitd8ee31a38b280e69c0b19e19992fc1df9c84c08c (patch)
treeb36c37f5fc4a8cf0de27b2aab17dcc93b30c85c8 /utils/runghc
parentb1e8c0320d855a0569243f7f88785ef8119b3789 (diff)
downloadhaskell-d8ee31a38b280e69c0b19e19992fc1df9c84c08c.tar.gz
Build runghc with Cabal
Diffstat (limited to 'utils/runghc')
-rw-r--r--utils/runghc/Makefile48
-rw-r--r--utils/runghc/runghc.cabal28
2 files changed, 31 insertions, 45 deletions
diff --git a/utils/runghc/Makefile b/utils/runghc/Makefile
index 54245a3397..37e2a1db5f 100644
--- a/utils/runghc/Makefile
+++ b/utils/runghc/Makefile
@@ -1,49 +1,7 @@
+
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
-
-ifeq "$(ghc_ge_605)" "NO"
-SRC_HC_OPTS += -cpp
-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 = runghc$(exeext)
-else
-HS_PROG = runghc-inplace$(exeext)
-endif
-INSTALL_PROGS += $(HS_PROG)
-
-UseGhcForCc = YES
-SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
-
-SRC_HC_OPTS += -Wall
-
-RUNHASKELL_PROG = runhaskell$(exeext)
-all :: $(RUNHASKELL_PROG)
-
-$(RUNHASKELL_PROG) : $(HS_PROG)
- $(CP) $< $(RUNHASKELL_PROG)
-
-MOSTLY_CLEAN_FILES += $(RUNHASKELL_PROG)
-
-ifneq "$(NO_INSTALL_RUNHASKELL)" "YES"
-INSTALL_PROGS += $(RUNHASKELL_PROG)
-endif
-
-binary-dist::
- $(INSTALL_DIR) $(BIN_DIST_DIR)/utils/runghc
- $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/runghc/
- $(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/runghc/
- $(INSTALL_PROGRAM) $(RUNHASKELL_PROG) $(BIN_DIST_DIR)/utils/runghc/
+# XXX Need to make runhaskell somehow
-include $(TOP)/mk/target.mk
diff --git a/utils/runghc/runghc.cabal b/utils/runghc/runghc.cabal
new file mode 100644
index 0000000000..17ed923cb0
--- /dev/null
+++ b/utils/runghc/runghc.cabal
@@ -0,0 +1,28 @@
+Name: runghc
+-- 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 runghc
+ Main-Is: runghc.hs
+
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4,
+ directory >= 1 && < 1.1,
+ process >= 1 && < 1.1
+ else
+ Build-Depends: base < 3
+