diff options
| author | mensinda <mensinda42@gmail.com> | 2018-11-24 19:45:49 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-06 12:15:10 +0100 |
| commit | 9d13855544cd4af446b589d77342cdbb7fd2456c (patch) | |
| tree | 4091f00aaf6a0bd6b51acf3456ae62178ff951df /mesonbuild/mintro.py | |
| parent | 80ee0f85f97b145058e2ca93090501f33a980a23 (diff) | |
| download | meson-9d13855544cd4af446b589d77342cdbb7fd2456c.zip meson-9d13855544cd4af446b589d77342cdbb7fd2456c.tar.gz meson-9d13855544cd4af446b589d77342cdbb7fd2456c.tar.bz2 | |
Fixed hardcode is_cross = False
Diffstat (limited to 'mesonbuild/mintro.py')
| -rw-r--r-- | mesonbuild/mintro.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 5509444..0459b4e 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -147,13 +147,12 @@ def list_targets(coredata, builddata, installdata): for i, comp in tgt.compilers.items(): if isinstance(comp, compilers.Compiler): - lang = comp.get_language() - if lang not in extra_args: - extra_args[lang] = [] + if i not in extra_args: + extra_args[i] = [] - extra_args[i] += tgt.get_extra_args(lang) - extra_args[i] += builddata.get_global_args(comp, False) - extra_args[i] += builddata.get_project_args(comp, tgt.subproject, False) + extra_args[i] += tgt.get_extra_args(i) + extra_args[i] += builddata.get_global_args(comp, tgt.is_cross) + extra_args[i] += builddata.get_project_args(comp, tgt.subproject, tgt.is_cross) for i in tgt.link_targets: climb_stack(i, inc_dirs, extra_args, dep_args) |