diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-04-14 12:58:30 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-02-13 15:26:44 +0200 |
| commit | 518c732ea9b0f1975f6f28accff3286be4106538 (patch) | |
| tree | 2be9544828545a2f9f0676efc6eb82ac197ec4bd /mesonbuild/backend/xcodebackend.py | |
| parent | ea678ed82938ceac00682b2695b57193d36b71b4 (diff) | |
| download | meson-optionrefactor3.zip meson-optionrefactor3.tar.gz meson-optionrefactor3.tar.bz2 | |
Make all Meson level options overridable per subproject.optionrefactor3
Diffstat (limited to 'mesonbuild/backend/xcodebackend.py')
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 0e40d02..9f2e0a1 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -1686,9 +1686,8 @@ class XCodeBackend(backends.Backend): if compiler is None: continue # Start with warning args - warn_args = compiler.get_warn_args(target.get_option(OptionKey('warning_level'))) - copt_proxy = target.get_options() - std_args = compiler.get_option_compile_args(copt_proxy) + warn_args = compiler.get_warn_args(self.get_target_option(target, 'warning_level')) + std_args = compiler.get_option_compile_args(target, self.environment, target.subproject) # Add compile args added using add_project_arguments() pargs = self.build.projects_args[target.for_machine].get(target.subproject, {}).get(lang, []) # Add compile args added using add_global_arguments() @@ -1736,9 +1735,9 @@ class XCodeBackend(backends.Backend): if target.suffix: suffix = '.' + target.suffix settings_dict.add_item('EXECUTABLE_SUFFIX', suffix) - settings_dict.add_item('GCC_GENERATE_DEBUGGING_SYMBOLS', BOOL2XCODEBOOL[target.get_option(OptionKey('debug'))]) + settings_dict.add_item('GCC_GENERATE_DEBUGGING_SYMBOLS', BOOL2XCODEBOOL[self.get_target_option(target, 'debug')]) settings_dict.add_item('GCC_INLINES_ARE_PRIVATE_EXTERN', 'NO') - opt_flag = OPT2XCODEOPT[target.get_option(OptionKey('optimization'))] + opt_flag = OPT2XCODEOPT[self.get_target_option(target, 'optimization')] if opt_flag is not None: settings_dict.add_item('GCC_OPTIMIZATION_LEVEL', opt_flag) if target.has_pch: |