Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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

Browse source 
SCons: Expand CXX in check for vanilla Clang
This commit is contained in:
Rémi Verschelde 2020-04-04 13:39:35 +02:00 • committed by GitHub
commit ea48b403a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
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):
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")