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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3bb64ba8eb7655f1742323f94c755ed08a74f676

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

commit 3bb64ba8eb7655f1742323f94c755ed08a74f676
Author: Simon Marlow <marlo...@gmail.com>
Date:   Fri Nov 4 16:19:55 2011 +0000

    only add -fno-ghci-history if GHC >= 7.3

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

 config/ghc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/config/ghc b/config/ghc
index b6340cc..1f77cc5 100644
--- a/config/ghc
+++ b/config/ghc
@@ -7,7 +7,7 @@ import re
 #
 config.compiler_type         = 'ghc'
 config.compiler              = 'ghc'
-config.compiler_always_flags = ['-fforce-recomp', '-dcore-lint', '-dcmm-lint', 
'-dno-debug-output', '-no-user-package-conf', '-rtsopts', '-fno-ghci-history']
+config.compiler_always_flags = ['-fforce-recomp', '-dcore-lint', '-dcmm-lint', 
'-dno-debug-output', '-no-user-package-conf', '-rtsopts']
 
 config.hp2ps                 = 'hp2ps'
 config.hpc                   = 'hpc'
@@ -142,6 +142,11 @@ def get_compiler_info():
     config.compiler_maj_version = re.sub('^([0-9]+\.[0-9]+).*',r'\1', v[0])
     config.compiler_tags = v[1:]
 
+    # -fno-ghci-history was added in 7.3
+    if version_ge(config.compiler_version, '7.3'):
+       config.compiler_always_flags = \
+          config.compiler_always_flags + ['-fno-ghci-history']
+
     if re.match(".*_p(_.*|$)", rtsInfoDict["RTS way"]):
         config.compiler_profiled = True
         config.run_ways = filter(lambda x: x != 'ghci', config.run_ways)



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to