From 817e18584cad44477794a29a1974adb8660a266b Mon Sep 17 00:00:00 2001 From: Antoine Jacoutot Date: Mon, 11 Mar 2019 10:26:14 +0100 Subject: environment: support OpenBSD in detect_objc_compiler We need to match the "clang --version" output on OpenBSD: $ clang --version | head -1 OpenBSD clang version 7.0.1 (tags/RELEASE_701/final) (based on LLVM 7.0.1) --- mesonbuild/environment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 2dc85f7..a4d8305 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -888,7 +888,7 @@ class Environment: return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) if out.startswith('Apple LLVM'): return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) - if out.startswith('clang'): + if out.startswith(('clang', 'OpenBSD clang')): return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) self._handle_exceptions(popen_exceptions, compilers) @@ -915,7 +915,7 @@ class Environment: return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines) if out.startswith('Apple LLVM'): return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap) - if out.startswith('clang'): + if out.startswith(('clang', 'OpenBSD clang')): return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) self._handle_exceptions(popen_exceptions, compilers) -- cgit v1.1