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:
67b3443
)
Removed a dependency on Cabal that caused a build failure when Cabal changed
author
Magnus Jonsson
<magnus@smartelectronix.com>
Wed, 8 Aug 2007 22:10:29 +0000
(22:10 +0000)
committer
Magnus Jonsson
<magnus@smartelectronix.com>
Wed, 8 Aug 2007 22:10:29 +0000
(22:10 +0000)
compiler/main/HeaderInfo.hs
patch
|
blob
|
history
diff --git
a/compiler/main/HeaderInfo.hs
b/compiler/main/HeaderInfo.hs
index
221e51b
..
4988d2e
100644
(file)
--- a/
compiler/main/HeaderInfo.hs
+++ b/
compiler/main/HeaderInfo.hs
@@
-33,10
+33,6
@@
import Panic
import Maybes
import Bag ( emptyBag, listToBag )
import Maybes
import Bag ( emptyBag, listToBag )
-import Distribution.Compiler
-import Distribution.Package
-import Distribution.Version
-
import Control.Exception
import Control.Monad
import System.Exit
import Control.Exception
import Control.Monad
import System.Exit
@@
-177,31
+173,15
@@
getOptions' buf filename
POk state' t -> (buffer state,t):lexAll state'
_ -> [(buffer state,L (last_loc state) ITeof)]
POk state' t -> (buffer state,t):lexAll state'
_ -> [(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 (L l ext)
checkExtension :: Located FastString -> Located String
checkExtension (L l ext)
- = case reads (unpackFS ext) of
- [] -> languagePragParseError l
- (okExt,""):_ ->
- case extensionsToFlags thisCompiler [okExt] of
- ([],[opt]) -> L l opt
- _ -> unsupportedExtnError l okExt
+-- Checks if a given extension is valid, and if so returns
+-- its corresponding flag. Otherwise it throws an exception.
+ = let ext' = unpackFS ext in
+ if ext' `elem` supportedLanguages
+ || ext' `elem` (map ("No"++) supportedLanguages)
+ then L l ("-X"++ext')
+ else unsupportedExtnError l ext'
languagePragParseError loc =
pgmError (showSDoc (mkLocMessage loc (
languagePragParseError loc =
pgmError (showSDoc (mkLocMessage loc (