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

Fix the g++ compiler detection which is broken by the new clang tool

This commit is contained in:
Thomas Nagy 2015-02-20 14:23:04 +01:00
parent 269c90fe1a
commit bbf26e0e12
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/genbench.py
View File

@ -257,8 +257,11 @@ APPNAME = 'build_bench'
top = '.'
out = 'out'
def options(opt):
opt.load('compiler_cxx')
def configure(conf):
conf.load('g++')
conf.load('compiler_cxx')
def build(bld):
for i in range(%d):

2
waflib/Tools/c_config.py
View File

@ -989,6 +989,8 @@ def get_cc_version(conf, cc, gcc=False, icc=False, clang=False):
if clang and out.find('__clang__') < 0:
conf.fatal('Not clang/clang++')
if not clang and out.find('__clang__') >= 0:
conf.fatal('Could not find g++, if renamed try eg: CXX=g++48 waf configure')
k = {}
if icc or gcc or clang: