diff options
| author | Hase Bastian <hase@hasebastian.de> | 2017-02-20 05:00:08 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-21 01:35:56 +0530 |
| commit | 283d5e623373dc5fa60dc51a21183cc403f3eac0 (patch) | |
| tree | ff09c8ef105eae9a71b1f5f7a2d86be34d8775dc | |
| parent | 238d1a37a0eed2a473950e335d44ba5d65217192 (diff) | |
| download | meson-283d5e623373dc5fa60dc51a21183cc403f3eac0.zip meson-283d5e623373dc5fa60dc51a21183cc403f3eac0.tar.gz meson-283d5e623373dc5fa60dc51a21183cc403f3eac0.tar.bz2 | |
Detect (non-Apple) clang as objc/c++ compiler
See https://github.com/mesonbuild/meson/pull/1388
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 5d8c0dc..9fdc7f4 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -556,6 +556,8 @@ class Environment: return GnuObjCCompiler(ccache + compiler, version, is_cross, exe_wrap, defines) if out.startswith('Apple LLVM'): return ClangObjCCompiler(ccache + compiler, version, CLANG_OSX, is_cross, exe_wrap) + if out.startswith('clang'): + return ClangObjCCompiler(ccache + compiler, version, CLANG_STANDARD, is_cross, exe_wrap) self._handle_compiler_exceptions(popen_exceptions, compilers) def detect_objcpp_compiler(self, want_cross): @@ -578,6 +580,8 @@ class Environment: return GnuObjCPPCompiler(ccache + compiler, version, is_cross, exe_wrap, defines) if out.startswith('Apple LLVM'): return ClangObjCPPCompiler(ccache + compiler, version, CLANG_OSX, is_cross, exe_wrap) + if out.startswith('clang'): + return ClangObjCPPCompiler(ccache + compiler, version, CLANG_STANDARD, is_cross, exe_wrap) self._handle_compiler_exceptions(popen_exceptions, compilers) def detect_java_compiler(self): |