From 9d13855544cd4af446b589d77342cdbb7fd2456c Mon Sep 17 00:00:00 2001 From: mensinda Date: Sat, 24 Nov 2018 19:45:49 +0100 Subject: Fixed hardcode is_cross = False --- mesonbuild/mintro.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 55094449e..0459b4e40 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) -- cgit v1.3