FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 09:57:15 +01:00
Code Issues Projects Releases Wiki Activity

Clean up some cruft in the compiler tools (icc, icpc, gxx)

Browse Source
This commit is contained in:
Krzysztof Kosiński 2014-01-25 20:59:14 +01:00
parent 82ab2fcaf5
commit 30bdee769b
4 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
waflib/Configure.py
View File

@ -550,11 +550,9 @@ def find_program(self, filename, **kw):
if interpreter is None:
if not Utils.check_exe(ret[0]):
self.fatal('Program %s is not executable' % ret)
if var:
self.env[var] = ret
self.env[var] = ret
else:
if var:
self.env[var] = self.env[interpreter] + ret
self.env[var] = self.env[interpreter] + ret
return ret

1
waflib/Tools/gxx.py
View File

@ -21,7 +21,6 @@ def find_gxx(conf):
cxx = conf.find_program(['g++', 'c++'], var='CXX')
conf.get_cc_version(cxx, gcc=True)
conf.env.CXX_NAME = 'gcc'
conf.env.CXX = cxx
@conf
def gxx_common_flags(conf):

14
waflib/Tools/icc.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
# Stian Selnes, 2008
# Stian Selnes 2008
# Thomas Nagy 2009-2010 (ita)
"""
@ -19,17 +19,9 @@ def find_icc(conf):
if sys.platform == 'cygwin':
conf.fatal('The Intel compiler does not work on Cygwin')
v = conf.env
cc = None
if v['CC']: cc = v['CC']
elif 'CC' in conf.environ: cc = conf.environ['CC']
if not cc: cc = conf.find_program('icc', var='CC')
if not cc: cc = conf.find_program('ICL', var='CC')
if not cc: conf.fatal('Intel C Compiler (icc) was not found')
cc = conf.find_program(['icc', 'ICL'], var='CC')
conf.get_cc_version(cc, icc=True)
v['CC'] = cc
v['CC_NAME'] = 'icc'
conf.env.CC_NAME = 'icc'
def configure(conf):
conf.find_icc()

11
waflib/Tools/icpc.py
View File

@ -18,16 +18,9 @@ def find_icpc(conf):
if sys.platform == 'cygwin':
conf.fatal('The Intel compiler does not work on Cygwin')
v = conf.env
cxx = None
if v['CXX']: cxx = v['CXX']
elif 'CXX' in conf.environ: cxx = conf.environ['CXX']
if not cxx: cxx = conf.find_program('icpc', var='CXX')
if not cxx: conf.fatal('Intel C++ Compiler (icpc) was not found')
cxx = conf.find_program('icpc', var='CXX')
conf.get_cc_version(cxx, icc=True)
v['CXX'] = cxx
v['CXX_NAME'] = 'icc'
conf.env.CXX_NAME = 'icc'
def configure(conf):
conf.find_icpc()