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

Update default compilers in compiler_c and compiler_cxx 

to include the clang tools
This commit is contained in:
Krzysztof Kosiński 2014-01-25 22:12:29 +01:00
parent b0b7227ddd
commit e4afaa957e
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Configure.py
View File

@ -493,7 +493,7 @@ def find_program(self, filename, **kw):
exts = kw.get('exts', Utils.is_win32 and '.exe,.com,.bat,.cmd' or ',.sh,.pl,.py') exts = kw.get('exts', Utils.is_win32 and '.exe,.com,.bat,.cmd' or ',.sh,.pl,.py')
environ = kw.get('environ', os.environ) environ = kw.get('environ', self.environ)
ret = '' ret = ''
filename = Utils.to_list(filename) filename = Utils.to_list(filename)

14
waflib/Tools/compiler_c.py
View File

@ -35,17 +35,17 @@ from waflib import Utils, Configure
from waflib.Logs import debug from waflib.Logs import debug
c_compiler = { c_compiler = {
'win32': ['msvc', 'gcc'], 'win32': ['msvc', 'gcc', 'clang'],
'cygwin': ['gcc'], 'cygwin': ['gcc'],
'darwin': ['gcc'], 'darwin': ['clang', 'gcc'],
'aix': ['xlc', 'gcc'], 'aix': ['xlc', 'gcc', 'clang'],
'linux': ['gcc', 'icc'], 'linux': ['gcc', 'clang', 'icc'],
'sunos': ['suncc', 'gcc'], 'sunos': ['suncc', 'gcc'],
'irix': ['gcc', 'irixcc'], 'irix': ['gcc', 'irixcc'],
'hpux': ['gcc'], 'hpux': ['gcc'],
'gnu': ['gcc'], 'gnu': ['gcc', 'clang'],
'java': ['gcc', 'msvc', 'icc'], 'java': ['gcc', 'msvc', 'clang', 'icc'],
'default':['gcc'], 'default':['gcc', 'clang'],
} }
""" """
Dict mapping the platform names to Waf tools finding specific C compilers:: Dict mapping the platform names to Waf tools finding specific C compilers::

14
waflib/Tools/compiler_cxx.py
View File

@ -36,17 +36,17 @@ from waflib import Utils, Configure
from waflib.Logs import debug from waflib.Logs import debug
cxx_compiler = { cxx_compiler = {
'win32': ['msvc', 'g++'], 'win32': ['msvc', 'g++', 'clang++'],
'cygwin': ['g++'], 'cygwin': ['g++'],
'darwin': ['g++'], 'darwin': ['clang++', 'g++'],
'aix': ['xlc++', 'g++'], 'aix': ['xlc++', 'g++', 'clang++'],
'linux': ['g++', 'icpc'], 'linux': ['g++', 'clang++', 'icpc'],
'sunos': ['sunc++', 'g++'], 'sunos': ['sunc++', 'g++'],
'irix': ['g++'], 'irix': ['g++'],
'hpux': ['g++'], 'hpux': ['g++'],
'gnu': ['g++'], 'gnu': ['g++', 'clang++'],
'java': ['g++', 'msvc', 'icpc'], 'java': ['g++', 'msvc', 'clang++', 'icpc'],
'default': ['g++'] 'default': ['g++', 'clang++']
} }
""" """
Dict mapping the platform names to Waf tools finding specific C++ compilers:: Dict mapping the platform names to Waf tools finding specific C++ compilers::