[commit: nofib] master: Don't use -package array everywhere (a0d10e4)

Ian Lynagh igloo at earth.li
Tue May 28 22:44:24 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/nofib

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/a0d10e4664506995efb14313ddeb420119847374

>---------------------------------------------------------------

commit a0d10e4664506995efb14313ddeb420119847374
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue May 28 21:34:59 2013 +0100

    Don't use -package array everywhere
    
    Only use it in benchmarks that use arrays

>---------------------------------------------------------------

 imaginary/kahan/Makefile |    2 ++
 mk/boilerplate.mk        |    7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/imaginary/kahan/Makefile b/imaginary/kahan/Makefile
index 993f91a..57dbe41 100644
--- a/imaginary/kahan/Makefile
+++ b/imaginary/kahan/Makefile
@@ -5,3 +5,5 @@ include $(TOP)/mk/target.mk
 FAST_OPTS = 100000
 NORM_OPTS = 250000
 SLOW_OPTS = 1000000
+
+SRC_HC_OPTS += -package array
diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 00659c4..b4015bb 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -49,13 +49,6 @@ NoFibRuns = 5
 
 SRC_HC_OPTS += $(NoFibHcOpts) -Rghc-timing
 
-# -package array is needed for GHC 7.0.1 and later, as the haskell98 package
-# is no longer linked by default.  We would like to use
-#    -hide-all-packages -package haskell2010
-# instead, but there is at least one program that uses a non-haskell2010
-# library module (fibheaps uses Control.Monad.ST)
-SRC_HC_OPTS += -package array
-
 ifeq "$(WithNofibHc)" ""
 
 STAGE1_GHC := $(abspath $(TOP)/../inplace/bin/ghc-stage1)





More information about the ghc-commits mailing list