diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-10 02:54:21 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-10 14:50:15 +0300 |
| commit | a8650bc82c95c4efe00c44395a73f8e7ed6b02e3 (patch) | |
| tree | 02da2fea6e8417b563213b52f67e3138b4d2455b | |
| parent | 1141e61b96f8159f8ff7cdfd4014cae7e13b4364 (diff) | |
| download | meson-xcodepartn.tar.gz | |
Xcode: use common language options like std version.xcodepartn
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 2008cb416..f4b0ff735 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -1001,13 +1001,15 @@ class XCodeBackend(backends.Backend): continue # Start with warning args warn_args = compiler.get_warn_args(self.get_option_for_target(OptionKey('warning_level'), target)) + copt_proxy = self.get_compiler_options_for_target(target) + std_args = compiler.get_option_compile_args(copt_proxy) # 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() # These override per-project arguments gargs = self.build.global_args[target.for_machine].get(lang, []) targs = target.get_extra_args(lang) - args = warn_args + pargs + gargs + targs + args = warn_args + std_args + pargs + gargs + targs if args: langname = LANGNAMEMAP[lang] lang_cargs = cargs |