浏览代码

Merge pull request #37576 from akien-mga/scons-fix-is_vanilla_clang

SCons: Expand CXX in check for vanilla Clang
Rémi Verschelde 5 年之前
父节点
当前提交
ea48b403a9
共有 1 个文件被更改,包括 5 次插入1 次删除
  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):
     if not using_clang(env):
         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")