diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-09 13:33:40 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-09 13:33:40 +0200 |
| commit | 1f5843495730e14ef0f40dca604cc854076ac1c1 (patch) | |
| tree | 7d9ea71ed3571b41c73fc4378b03687345ce78c1 | |
| parent | 0a4818164de8b35fff1b80020d2f7a6ede8f7036 (diff) | |
| download | meson-1f5843495730e14ef0f40dca604cc854076ac1c1.tar.gz | |
A few clang fixes.
| -rw-r--r-- | environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/environment.py b/environment.py index dafb5a774..4b3337707 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() |