aboutsummaryrefslogtreecommitdiff
path: root/environment.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-03-09 13:33:40 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2014-03-09 13:33:40 +0200
commit1f5843495730e14ef0f40dca604cc854076ac1c1 (patch)
tree7d9ea71ed3571b41c73fc4378b03687345ce78c1 /environment.py
parent0a4818164de8b35fff1b80020d2f7a6ede8f7036 (diff)
downloadmeson-1f5843495730e14ef0f40dca604cc854076ac1c1.zip
meson-1f5843495730e14ef0f40dca604cc854076ac1c1.tar.gz
meson-1f5843495730e14ef0f40dca604cc854076ac1c1.tar.bz2
A few clang fixes.
Diffstat (limited to 'environment.py')
-rw-r--r--environment.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/environment.py b/environment.py
index dafb5a7..4b33377 100644
--- a/environment.py
+++ b/environment.py
@@ -911,7 +911,7 @@ class Environment():
if (out.startswith('cc') or 'gcc' in out) and \
'Free Software Foundation' in out:
return GnuCCompiler(ccache + [compiler], version, GCC_STANDARD, is_cross, exe_wrap)
- if (out.startswith('clang')):
+ if 'clang' in out:
return ClangCCompiler(ccache + [compiler], version, is_cross, exe_wrap)
if 'Microsoft' in out:
# Visual Studio prints version number to stderr but
@@ -969,7 +969,7 @@ class Environment():
return GnuCPPCompiler(ccache + [compiler], version, is_cross, exe_wrap)
if 'apple' in out and 'Free Software Foundation' in out:
return GnuCPPCompiler(ccache + [compiler], version, is_cross, exe_wrap)
- if out.startswith('clang'):
+ if 'clang' in out:
return ClangCPPCompiler(ccache + [compiler], version, is_cross, exe_wrap)
if 'Microsoft' in out:
version = re.search(Environment.version_regex, err).group()