diff options
| author | Dan Kegel <dank@kegel.com> | 2019-06-11 09:21:39 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-06-11 10:13:50 -0700 |
| commit | b28e76f6bf6898a7de01f5dd103d5ad7c54bea45 (patch) | |
| tree | f25b1bb0c20a6e21a6dc5b2bd961973ce0dafbb6 | |
| parent | 0e23dbec81ee47787d382432dbbd3724fb976b46 (diff) | |
| download | meson-b28e76f6bf6898a7de01f5dd103d5ad7c54bea45.zip meson-b28e76f6bf6898a7de01f5dd103d5ad7c54bea45.tar.gz meson-b28e76f6bf6898a7de01f5dd103d5ad7c54bea45.tar.bz2 | |
environment: better xcode 11 clang detection
Fixes #5474
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index ce78162..1df80ca 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -952,7 +952,7 @@ class Environment: compiler_type = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) return GnuObjCCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines) - if out.startswith('Apple LLVM'): + if out.startswith('Apple LLVM') or out.startswith('Apple clang'): return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap) if 'windows' in out: return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap) @@ -982,7 +982,7 @@ class Environment: compiler_type = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines) - if out.startswith('Apple LLVM'): + if out.startswith('Apple LLVM') or out.startswith('Apple clang'): return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap) if 'windows' in out: return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap) |