Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
04d3b8d7
Commit
04d3b8d7
authored
Oct 06, 2010
by
Ian Lynagh
Browse files
Fix build following haskell98 and -fglasgow-exts changes
parent
5e54b553
Changes
7
Hide whitespace changes
Inline
Side-by-side
compiler/cmm/ZipDataflow.hs
View file @
04d3b8d7
{-# LANGUAGE MultiParamTypeClasses, ScopedTypeVariables #-}
{-# OPTIONS -fglasgow-exts #-}
-- -fglagow-exts for kind signatures
{-# LANGUAGE MultiParamTypeClasses, ScopedTypeVariables, KindSignatures,
FlexibleContexts #-}
module
ZipDataflow
(
DebugNodes
(),
RewritingDepth
(
..
),
LastOutFacts
(
..
)
...
...
configure.ac
View file @
04d3b8d7
...
...
@@ -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_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
...
...
ghc.mk
View file @
04d3b8d7
...
...
@@ -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/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.
...
...
utils/ghc-pkg/Main.hs
View file @
04d3b8d7
{-#
OPTIONS -fglasgow-exts -cpp
#-}
{-#
LANGUAGE PatternGuards, CPP
#-}
-----------------------------------------------------------------------------
--
-- (c) The University of Glasgow 2004-2009.
...
...
utils/hpc/HpcReport.hs
View file @
04d3b8d7
...
...
@@ -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
...
...
utils/runghc/ghc.mk
View file @
04d3b8d7
...
...
@@ -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
...
...
utils/runghc/runghc.cabal.in
View file @
04d3b8d7
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment