[commit: ghc] master: testsuite: Don't fail if "target has RTS linker" field is missing (b626a00)

git at git.haskell.org git at git.haskell.org
Fri Jan 20 22:25:55 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b626a00113ecdb960ba642f0ce31e2ff71892b4d/ghc

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

commit b626a00113ecdb960ba642f0ce31e2ff71892b4d
Author: Reid Barton <rwbarton at gmail.com>
Date:   Fri Jan 20 16:49:37 2017 -0500

    testsuite: Don't fail if "target has RTS linker" field is missing
    
    Test Plan: harbormaster
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2991


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

b626a00113ecdb960ba642f0ce31e2ff71892b4d
 testsuite/config/ghc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index b126580..959422e 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -166,7 +166,10 @@ def get_compiler_info():
     rtsInfoDict = dict(eval(s))
 
     # external interpreter needs RTS linker support
-    config.have_ext_interp = compilerInfoDict["target has RTS linker"] == "YES"
+    # If the field is not present (GHC 8.0 and earlier), assume we don't
+    # have -fexternal-interpreter (though GHC 8.0 actually does)
+    # so we can still run most tests.
+    config.have_ext_interp = compilerInfoDict.get("target has RTS linker", "NO") == "YES"
 
     # See Note [Replacing backward slashes in config.libdir].
     config.libdir = compilerInfoDict['LibDir'].replace('\\', '/')



More information about the ghc-commits mailing list