summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2019-06-18 12:10:55 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2019-06-22 15:54:09 +0530
commit654d91322cd749038a28b90fce2031cc4e8d3a53 (patch)
tree8a2d8f106586b70f9849feceb50b584329833a8e /mesonbuild/compilers
parentd1dd6df37b3061d3595a25a2c12f04de235449a8 (diff)
downloadmeson-nirbheek/fix-objc-bitcode.tar.gz
compilers: Fix bitcode and other options for objc codenirbheek/fix-objc-bitcode
We were setting the base options for the Objective-C compiler manually, due to which options such as b_bitcode and b_ndebug were not getting set at all. The base options here are the same as for C code with the Clang compiler, so just use the same inherited list. Also expand the bitcode test to ObjC and ObjC++ so this doesn't happen again.
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/objc.py1
-rw-r--r--mesonbuild/compilers/objcpp.py1
2 files changed, 0 insertions, 2 deletions
diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py
index f9ca793be..b45f75b7d 100644
--- a/mesonbuild/compilers/objc.py
+++ b/mesonbuild/compilers/objc.py
@@ -74,4 +74,3 @@ class ClangObjCCompiler(ClangCompiler, ObjCCompiler):
'1': default_warn_args,
'2': default_warn_args + ['-Wextra'],
'3': default_warn_args + ['-Wextra', '-Wpedantic']}
- self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage']
diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py
index 2e81b4c39..f74bbd8fe 100644
--- a/mesonbuild/compilers/objcpp.py
+++ b/mesonbuild/compilers/objcpp.py
@@ -75,4 +75,3 @@ class ClangObjCPPCompiler(ClangCompiler, ObjCPPCompiler):
'1': default_warn_args,
'2': default_warn_args + ['-Wextra'],
'3': default_warn_args + ['-Wextra', '-Wpedantic']}
- self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage']