aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@openbsd.org>2019-03-11 10:26:14 +0100
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2019-03-11 11:37:02 +0000
commit7bc04996c0d98797be1516643b833f2206e61151 (patch)
tree6babd9a7459cb7ef27a2149fafe2d48cb85edba8 /mesonbuild/environment.py
parentc1c699eda4ed4f8778e621e5d635e31264400053 (diff)
downloadmeson-7bc04996c0d98797be1516643b833f2206e61151.zip
meson-7bc04996c0d98797be1516643b833f2206e61151.tar.gz
meson-7bc04996c0d98797be1516643b833f2206e61151.tar.bz2
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)
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index c25ef33..b00b0f2 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)