diff options
| author | Matthew Waters <matthew@centricular.com> | 2019-10-02 14:55:46 +1000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2019-10-02 14:57:14 +1000 |
| commit | d0a52a551b515042e0d9160795cb8c1bba7b8411 (patch) | |
| tree | ca2bd394f454e4c19c3746f506d1884b57bce880 /recipes/build-tools | |
| parent | a2009e620ad75a0ff1503d5986ba3b640cb0ad4e (diff) | |
meson: fix detection of xcode 11 clang on osx/ios
Diffstat (limited to 'recipes/build-tools')
| -rw-r--r-- | recipes/build-tools/meson.recipe | 2 | ||||
| -rw-r--r-- | recipes/build-tools/meson/0001-environment-better-xcode-11-clang-detection.patch | 35 |
2 files changed, 37 insertions, 0 deletions
diff --git a/recipes/build-tools/meson.recipe b/recipes/build-tools/meson.recipe index fb473e6e..ce5f8248 100644 --- a/recipes/build-tools/meson.recipe +++ b/recipes/build-tools/meson.recipe @@ -25,6 +25,8 @@ class Recipe(recipe.Recipe): 'meson/0001-compilers-Fix-bitcode-and-other-options-for-objc-cod.patch', # Not needed with 0.50, code changed 'meson/0001-ninja-backend-Quote-args-to-compiler-rules.patch', + # https://github.com/mesonbuild/meson/pull/5475 + 'meson/0001-environment-better-xcode-11-clang-detection.patch', ] deps = ['ninja'] diff --git a/recipes/build-tools/meson/0001-environment-better-xcode-11-clang-detection.patch b/recipes/build-tools/meson/0001-environment-better-xcode-11-clang-detection.patch new file mode 100644 index 00000000..a16f80d0 --- /dev/null +++ b/recipes/build-tools/meson/0001-environment-better-xcode-11-clang-detection.patch @@ -0,0 +1,35 @@ +From 0654ad1347b282f59ae4d008733aca221a15a92d Mon Sep 17 00:00:00 2001 +From: Dan Kegel <dank@kegel.com> +Date: Tue, 11 Jun 2019 09:21:39 -0700 +Subject: [PATCH] environment: better xcode 11 clang detection + +Fixes #5474 +--- + mesonbuild/environment.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index 6d86daf..4cf2e05 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -797,7 +797,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, 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, is_cross, exe_wrap) + if out.startswith('clang'): + return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) +@@ -824,7 +824,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, 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, is_cross, exe_wrap) + if out.startswith('clang'): + return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap) +-- +2.21.0 (Apple Git-122) + |