Browse Source

SCons: Expand CXX in check for vanilla Clang

I had missed it in df7ecfc4a7f8403144be2aa49bb47f9ead25926b it seems.

Fixes #37575.
Rémi Verschelde 5 years ago
parent
commit
2e2ccb994b
1 changed files with 5 additions and 1 deletions
  1. 5 1
      methods.py

+ 5 - 1
methods.py

@@ -598,7 +598,11 @@ def detect_darwin_sdk_path(platform, env):
 def is_vanilla_clang(env):
 def is_vanilla_clang(env):
     if not using_clang(env):
     if not using_clang(env):
         return False
         return False
-    version = subprocess.check_output([env["CXX"], "--version"]).strip().decode("utf-8")
+    try:
+        version = subprocess.check_output([env.subst(env["CXX"]), "--version"]).strip().decode("utf-8")
+    except (subprocess.CalledProcessError, OSError):
+        print("Couldn't parse CXX environment variable to infer compiler version.")
+        return False
     return not version.startswith("Apple")
     return not version.startswith("Apple")