godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCons: Expand CXX in check for vanilla Clang 

I had missed it in df7ecfc4a7 it seems.

Fixes #37575.
This commit is contained in:
Rémi Verschelde 2020-04-04 12:12:10 +02:00
parent 9abb415d92
commit 2e2ccb994b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
methods.py
View File

@ -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")