From 47d37047e1f51f32184e7a3b6e68a22c2156ae32 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 2 Nov 2010 18:58:31 +0000 Subject: [PATCH] Fix building genprimopcode with GHC 7.0, and remove haskell98 imports --- utils/genprimopcode/Main.hs | 8 ++++---- 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 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)) -- 1.7.10.4