diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-11-04 16:19:55 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-11-07 09:20:05 +0000 |
| commit | 5ae42c5e0b104461ec684dd58e63ce9d1635194f (patch) | |
| tree | 276292d6eec8deb71698d5b145c999244a202582 /testsuite/config | |
| parent | fd5a3454d3bdd6a7f54921da6b25e408a1947f30 (diff) | |
| download | haskell-5ae42c5e0b104461ec684dd58e63ce9d1635194f.tar.gz | |
only add -fno-ghci-history if GHC >= 7.3
Diffstat (limited to 'testsuite/config')
| -rw-r--r-- | testsuite/config/ghc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index b6340cce70..1f77cc54fd 100644 --- a/testsuite/config/ghc +++ b/testsuite/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) |