diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-10-06 16:06:56 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-10-06 16:06:56 +0000 |
| commit | 04d3b8d7ad637c6e5b8b8004a0555c4f1ead83dc (patch) | |
| tree | bbabb0fc09d196d945d1c871419018ecae711af7 /utils | |
| parent | 5e54b553bbb112167412ee9164135d56b06f5721 (diff) | |
| download | haskell-04d3b8d7ad637c6e5b8b8004a0555c4f1ead83dc.tar.gz | |
Fix build following haskell98 and -fglasgow-exts changes
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 2 | ||||
| -rw-r--r-- | utils/hpc/HpcReport.hs | 2 | ||||
| -rw-r--r-- | utils/runghc/ghc.mk | 5 | ||||
| -rw-r--r-- | utils/runghc/runghc.cabal.in | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index 02d0a0df74..e42fa4c3c2 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -cpp #-} +{-# LANGUAGE PatternGuards, CPP #-} ----------------------------------------------------------------------------- -- -- (c) The University of Glasgow 2004-2009. diff --git a/utils/hpc/HpcReport.hs b/utils/hpc/HpcReport.hs index f44f967eaa..5d8c714692 100644 --- a/utils/hpc/HpcReport.hs +++ b/utils/hpc/HpcReport.hs @@ -6,7 +6,7 @@ module HpcReport (report_plugin) where import Prelude hiding (exp) -import List(sort,intersperse,sortBy) +import Data.List(sort,intersperse,sortBy) import HpcFlags import Trace.Hpc.Mix import Trace.Hpc.Tix diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk index a70e38a03b..26c3b31228 100644 --- a/utils/runghc/ghc.mk +++ b/utils/runghc/ghc.mk @@ -10,11 +10,12 @@ # # ----------------------------------------------------------------------------- -utils/runghc_dist_MODULES = Main -utils/runghc_dist_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\"" +utils/runghc_PACKAGE = runghc +utils/runghc_dist_USES_CABAL = YES utils/runghc_dist_PROG = runghc$(exeext) utils/runghc_dist_SHELL_WRAPPER = YES utils/runghc_dist_INSTALL_SHELL_WRAPPER = YES +utils/runghc_dist_EXTRA_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\"" ifneq "$(BINDIST)" "YES" # hack: the build system has trouble with Main modules not called Main.hs diff --git a/utils/runghc/runghc.cabal.in b/utils/runghc/runghc.cabal.in index 7b3fc1b13a..7dfdc97a5d 100644 --- a/utils/runghc/runghc.cabal.in +++ b/utils/runghc/runghc.cabal.in @@ -20,7 +20,7 @@ Executable runghc if flag(base3) Build-Depends: base >= 3 && < 5, - directory >= 1 && < 1.1, + directory >= 1 && < 1.2, process >= 1 && < 1.1 else Build-Depends: base < 3 |