From: Ian Lynagh <igloo@earth.li>
Date: Tue, 2 Nov 2010 18:58:31 +0000 (+0000)
Subject: Fix building genprimopcode with GHC 7.0, and remove haskell98 imports
X-Git-Tag: 2010-11-18~46
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=47d37047e1f51f32184e7a3b6e68a22c2156ae32

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
--- 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
--- 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))