qgroundcontrol: 4.4.2 -> 4.4.3 (#360956)
[NixPkgs.git] / pkgs / by-name / me / meson / 006-disable-bitcode.patch
blobd4aa6a271aa65a0ba3bbd5830413e39bba6fdaa0
1 diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
2 index d99dc3abf..6b8f75165 100644
3 --- a/mesonbuild/compilers/mixins/clang.py
4 +++ b/mesonbuild/compilers/mixins/clang.py
5 @@ -54,11 +54,7 @@ class ClangCompiler(GnuLikeCompiler):
6 {OptionKey('b_colorout'), OptionKey('b_lto_threads'), OptionKey('b_lto_mode'), OptionKey('b_thinlto_cache'),
7 OptionKey('b_thinlto_cache_dir')})
9 - # TODO: this really should be part of the linker base_options, but
10 - # linkers don't have base_options.
11 - if isinstance(self.linker, AppleDynamicLinker):
12 - self.base_options.add(OptionKey('b_bitcode'))
13 - elif isinstance(self.linker, MSVCDynamicLinker):
14 + if isinstance(self.linker, MSVCDynamicLinker):
15 self.base_options.add(OptionKey('b_vscrt'))
16 # All Clang backends can also do LLVM IR
17 self.can_compile_suffixes.add('ll')
18 diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
19 index 4eec82edd..6db5c6af0 100644
20 --- a/mesonbuild/linkers/linkers.py
21 +++ b/mesonbuild/linkers/linkers.py
22 @@ -796,7 +796,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
23 return self._apply_prefix('-headerpad_max_install_names')
25 def bitcode_args(self) -> T.List[str]:
26 - return self._apply_prefix('-bitcode_bundle')
27 + raise MesonException('Nixpkgs cctools does not support bitcode bundles')
29 def fatal_warnings(self) -> T.List[str]:
30 return self._apply_prefix('-fatal_warnings')