Merge pull request #11710 from mattip/allow-clang

BUG: compiler used is env['CC'], then config_vars['CC']

1 files changed, 3 insertions, 2 deletions

diff --git a/runtests.py b/runtests.py
index 388b911a1..81c7c103f 100755
--- a/runtests.py
+++ b/runtests.py
@@ -328,9 +328,10 @@ def build_project(args):
     # Always use ccache, if installed
     env['PATH'] = os.pathsep.join(EXTRA_PATH + env.get('PATH', '').split(os.pathsep))
     cvars = distutils.sysconfig.get_config_vars()
-    if 'gcc' in cvars.get('CC', ''):
+    compiler = env.get('CC') or cvars.get('CC', '')
+    if 'gcc' in compiler:
         # Check that this isn't clang masquerading as gcc.
-        if sys.platform != 'darwin' or 'gnu-gcc' in cvars.get('CC', ''):
+        if sys.platform != 'darwin' or 'gnu-gcc' in compiler:
             # add flags used as werrors
             warnings_as_errors = ' '.join([
                 # from tools/travis-test.sh