Fixes to compile with 6.5
This commit is contained in:
parent
bf228280e3
commit
6c122b67c4
2
configure
vendored
2
configure
vendored
@ -1450,7 +1450,7 @@ echo "$as_me: error: You need GHC to build this project" >&2;}
|
|||||||
fi;
|
fi;
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
#define WITH_GHC $GHC
|
#define WITH_GHC "$GHC"
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ AC_ARG_WITH(ghc,
|
|||||||
fi
|
fi
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
AC_DEFINE_UNQUOTED(WITH_GHC, $GHC, [Which ghc to use])
|
AC_DEFINE_UNQUOTED(WITH_GHC, "$GHC", [Which ghc to use])
|
||||||
AC_SUBST(GHC)
|
AC_SUBST(GHC)
|
||||||
|
|
||||||
# Work out value of __GLASGOW_HASKELL__
|
# Work out value of __GLASGOW_HASKELL__
|
||||||
|
@ -67,8 +67,8 @@ module Language.Hi.FastString
|
|||||||
|
|
||||||
import Language.Hi.PrimPacked
|
import Language.Hi.PrimPacked
|
||||||
|
|
||||||
import IO
|
import System.IO
|
||||||
import Char ( chr, ord )
|
import Data.Char ( chr, ord )
|
||||||
|
|
||||||
import GHC.Exts
|
import GHC.Exts
|
||||||
import GHC.IOBase
|
import GHC.IOBase
|
||||||
|
@ -39,8 +39,8 @@ import Distribution.InstalledPackageInfo
|
|||||||
import Distribution.Package
|
import Distribution.Package
|
||||||
import Distribution.Version
|
import Distribution.Version
|
||||||
|
|
||||||
import Char ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )
|
import Data.Char ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )
|
||||||
import List ( break )
|
import Data.List ( break )
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,6 +32,6 @@ exposed-modules:
|
|||||||
c-sources:
|
c-sources:
|
||||||
Language/Hi/hschooks.c
|
Language/Hi/hschooks.c
|
||||||
includes: Linker.h
|
includes: Linker.h
|
||||||
Build-Depends: base, haskell-src-exts>=0.2, Cabal
|
Build-Depends: base, haskell98, Cabal, haskell-src-exts>=0.2
|
||||||
ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures -threaded
|
ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures -threaded
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user