projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e54b55
)
Fix build following haskell98 and -fglasgow-exts changes
author
Ian Lynagh
<igloo@earth.li>
Wed, 6 Oct 2010 16:06:56 +0000
(16:06 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Wed, 6 Oct 2010 16:06:56 +0000
(16:06 +0000)
compiler/cmm/ZipDataflow.hs
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
ghc.mk
patch
|
blob
|
history
utils/ghc-pkg/Main.hs
patch
|
blob
|
history
utils/hpc/HpcReport.hs
patch
|
blob
|
history
utils/runghc/ghc.mk
patch
|
blob
|
history
utils/runghc/runghc.cabal.in
patch
|
blob
|
history
diff --git
a/compiler/cmm/ZipDataflow.hs
b/compiler/cmm/ZipDataflow.hs
index
388d99c
..
4355775
100644
(file)
--- a/
compiler/cmm/ZipDataflow.hs
+++ b/
compiler/cmm/ZipDataflow.hs
@@
-1,6
+1,5
@@
-{-# LANGUAGE MultiParamTypeClasses, ScopedTypeVariables #-}
-{-# OPTIONS -fglasgow-exts #-}
--- -fglagow-exts for kind signatures
+{-# LANGUAGE MultiParamTypeClasses, ScopedTypeVariables, KindSignatures,
+ FlexibleContexts #-}
module ZipDataflow
( DebugNodes(), RewritingDepth(..), LastOutFacts(..)
module ZipDataflow
( DebugNodes(), RewritingDepth(..), LastOutFacts(..)
diff --git
a/configure.ac
b/configure.ac
index
600317d
..
dc94cf3
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-950,7
+950,7
@@
if grep ' ' compiler/ghc.cabal.in 2>&1 >/dev/null; then
AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
fi
AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
fi
-AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml docs/index.html libraries/prologue.txt distrib/ghc.iss distrib/configure.ac])
+AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml docs/index.html libraries/prologue.txt distrib/ghc.iss distrib/configure.ac])
AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
AC_OUTPUT
AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
AC_OUTPUT
diff --git
a/ghc.mk
b/ghc.mk
index
de30411
..
6066318
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-432,6
+432,7
@@
utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk
utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/compare_sizes/dist/package-data.mk: compiler/stage2/package-data.mk
utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/compare_sizes/dist/package-data.mk: compiler/stage2/package-data.mk
+utils/runghc/dist/package-data.mk: compiler/stage2/package-data.mk
# add the final two package.conf dependencies: ghc-prim depends on RTS,
# and RTS depends on libffi.
# add the final two package.conf dependencies: ghc-prim depends on RTS,
# and RTS depends on libffi.
diff --git
a/utils/ghc-pkg/Main.hs
b/utils/ghc-pkg/Main.hs
index
02d0a0d
..
e42fa4c
100644
(file)
--- 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.
-----------------------------------------------------------------------------
--
-- (c) The University of Glasgow 2004-2009.
diff --git
a/utils/hpc/HpcReport.hs
b/utils/hpc/HpcReport.hs
index
f44f967
..
5d8c714
100644
(file)
--- a/
utils/hpc/HpcReport.hs
+++ b/
utils/hpc/HpcReport.hs
@@
-6,7
+6,7
@@
module HpcReport (report_plugin) where
import Prelude hiding (exp)
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
import HpcFlags
import Trace.Hpc.Mix
import Trace.Hpc.Tix
diff --git
a/utils/runghc/ghc.mk
b/utils/runghc/ghc.mk
index
a70e38a
..
26c3b31
100644
(file)
--- 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_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
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
7b3fc1b
..
7dfdc97
100644
(file)
--- 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,
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
process >= 1 && < 1.1
else
Build-Depends: base < 3