FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify Clang macro detection

This commit is contained in:
Thomas Nagy 2015-08-07 10:51:45 +02:00
parent 45ffae6d4e
commit 6ca1c7cad4
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
waflib/Tools/c_config.py
View File

@ -1076,13 +1076,10 @@ def get_cc_version(conf, cc, gcc=False, icc=False, clang=False):
ver = k['__INTEL_COMPILER']
conf.env['CC_VERSION'] = (ver[:-2], ver[-2], ver[-1])
else:
if isD('__clang__'):
try:
conf.env['CC_VERSION'] = (k['__clang_major__'], k['__clang_minor__'], k['__clang_patchlevel__'])
except KeyError:
# Some versions of OSX have a faux-gcc "clang" without clang version defines
conf.env['CC_VERSION'] = (k['__GNUC__'], k['__GNUC_MINOR__'], k['__GNUC_PATCHLEVEL__'])
if isD('__clang__') and isD('__clang_major__'):
conf.env['CC_VERSION'] = (k['__clang_major__'], k['__clang_minor__'], k['__clang_patchlevel__'])
else:
# older clang versions and gcc
conf.env['CC_VERSION'] = (k['__GNUC__'], k['__GNUC_MINOR__'], k.get('__GNUC_PATCHLEVEL__', '0'))
return k