Fix building genprimopcode with GHC 7.0, and remove haskell98 imports

diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs
index 3d7c83f..5b802bc 100644 (file)
--- 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 517c577..5cbf82e 100644 (file)
--- 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))