Commit f0aa996d authored by Magnus Jonsson's avatar Magnus Jonsson
Browse files

Removed a dependency on Cabal that caused a build failure when Cabal changed

parent 67b34437
...@@ -33,10 +33,6 @@ import Panic ...@@ -33,10 +33,6 @@ import Panic
import Maybes import Maybes
import Bag ( emptyBag, listToBag ) import Bag ( emptyBag, listToBag )
import Distribution.Compiler
import Distribution.Package
import Distribution.Version
import Control.Exception import Control.Exception
import Control.Monad import Control.Monad
import System.Exit import System.Exit
...@@ -177,31 +173,15 @@ getOptions' buf filename ...@@ -177,31 +173,15 @@ getOptions' buf filename
POk state' t -> (buffer state,t):lexAll state' POk state' t -> (buffer state,t):lexAll state'
_ -> [(buffer state,L (last_loc state) ITeof)] _ -> [(buffer state,L (last_loc state) ITeof)]
thisCompiler :: Compiler
thisCompiler = Compiler {
compilerFlavor = GHC,
compilerId = PackageIdentifier {
pkgName = "ghc",
pkgVersion = v
},
compilerProg = panic "No compiler program yet",
compilerPkgTool = panic "No package program yet",
compilerLanguagesKnown = True,
compilerLanguages = supportedLanguages
}
where v = case readVersion cProjectVersion of
Just version -> version
Nothing ->
panic ("Can't parse version: " ++ show cProjectVersion)
checkExtension :: Located FastString -> Located String checkExtension :: Located FastString -> Located String
checkExtension (L l ext) checkExtension (L l ext)
= case reads (unpackFS ext) of -- Checks if a given extension is valid, and if so returns
[] -> languagePragParseError l -- its corresponding flag. Otherwise it throws an exception.
(okExt,""):_ -> = let ext' = unpackFS ext in
case extensionsToFlags thisCompiler [okExt] of if ext' `elem` supportedLanguages
([],[opt]) -> L l opt || ext' `elem` (map ("No"++) supportedLanguages)
_ -> unsupportedExtnError l okExt then L l ("-X"++ext')
else unsupportedExtnError l ext'
languagePragParseError loc = languagePragParseError loc =
pgmError (showSDoc (mkLocMessage loc ( pgmError (showSDoc (mkLocMessage loc (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment