diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-11-02 18:58:31 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-11-02 18:58:31 +0000 |
| commit | 47d37047e1f51f32184e7a3b6e68a22c2156ae32 (patch) | |
| tree | 237f76a8cb456a937501d1aa25efc6d4b9adfd24 /utils | |
| parent | 066d28b97c0c50ba5c2f395e02e2c56b3e562537 (diff) | |
| download | haskell-47d37047e1f51f32184e7a3b6e68a22c2156ae32.tar.gz | |
Fix building genprimopcode with GHC 7.0, and remove haskell98 imports
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/genprimopcode/Main.hs | 8 | ||||
| -rw-r--r-- | utils/genprimopcode/ghc.mk | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs index 3d7c83f34f..5b802bccd7 100644 --- a/utils/genprimopcode/Main.hs +++ b/utils/genprimopcode/Main.hs @@ -8,10 +8,10 @@ module Main where import Parser import Syntax -import Char -import List -import System ( getArgs ) -import Maybe ( catMaybes ) +import Data.Char +import Data.List +import Data.Maybe ( catMaybes ) +import System.Environment ( getArgs ) main :: IO () main = getArgs >>= \args -> diff --git a/utils/genprimopcode/ghc.mk b/utils/genprimopcode/ghc.mk index 517c5773ba..5cbf82e831 100644 --- a/utils/genprimopcode/ghc.mk +++ b/utils/genprimopcode/ghc.mk @@ -12,5 +12,6 @@ utils/genprimopcode_dist_MODULES = Lexer Main ParserM Parser Syntax utils/genprimopcode_dist_PROG = $(GHC_GENPRIMOP_PGM) +utils/genprimopcode_dist_HC_OPTS = -package array $(eval $(call build-prog,utils/genprimopcode,dist,0)) |