diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-11 21:37:40 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-08-06 00:11:38 +0300 |
| commit | 647e871484eb2d8b5ce695c2ff97c9cbd9fd6d5d (patch) | |
| tree | d5fed1555235c1d256e45bfa327c365e4da42a4c /mesonbuild/backend/backends.py | |
| parent | c9aea4e11c648f1051454132626bcb4aef976d6d (diff) | |
| download | meson-crossargfix.zip meson-crossargfix.tar.gz meson-crossargfix.tar.bz2 | |
Store global and project arguments separately for cross and native compilation.crossargfix
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 2105d42..7381eb5 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -532,10 +532,10 @@ class Backend: # Add buildtype args: optimization level, debugging, etc. commands += compiler.get_buildtype_args(self.get_option_for_target('buildtype', target)) # Add compile args added using add_project_arguments() - commands += self.build.get_project_args(compiler, target.subproject) + commands += self.build.get_project_args(compiler, target.subproject, target.is_cross) # Add compile args added using add_global_arguments() # These override per-project arguments - commands += self.build.get_global_args(compiler) + commands += self.build.get_global_args(compiler, target.is_cross) if not target.is_cross: # Compile args added from the env: CFLAGS/CXXFLAGS, etc. We want these # to override all the defaults, but not the per-target compile args. |