mirror of https://gitlab.com/ita1024/waf.git
Fix the g++ compiler detection which is broken by the new clang tool
This commit is contained in:
parent
269c90fe1a
commit
bbf26e0e12
|
@ -257,8 +257,11 @@ APPNAME = 'build_bench'
|
||||||
top = '.'
|
top = '.'
|
||||||
out = 'out'
|
out = 'out'
|
||||||
|
|
||||||
|
def options(opt):
|
||||||
|
opt.load('compiler_cxx')
|
||||||
|
|
||||||
def configure(conf):
|
def configure(conf):
|
||||||
conf.load('g++')
|
conf.load('compiler_cxx')
|
||||||
|
|
||||||
def build(bld):
|
def build(bld):
|
||||||
for i in range(%d):
|
for i in range(%d):
|
||||||
|
|
|
@ -989,6 +989,8 @@ def get_cc_version(conf, cc, gcc=False, icc=False, clang=False):
|
||||||
|
|
||||||
if clang and out.find('__clang__') < 0:
|
if clang and out.find('__clang__') < 0:
|
||||||
conf.fatal('Not clang/clang++')
|
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 = {}
|
k = {}
|
||||||
if icc or gcc or clang:
|
if icc or gcc or clang:
|
||||||
|
|
Loading…
Reference in New Issue