From 4db37cc8d9139076682e2528d29e92fad2eb1c90 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Wed, 17 Jan 2018 11:22:57 -0800 Subject: meson.bbclass: add MESON_LINK_ARGS to vardeps Currently, we include MESON_C_ARGS in write_config[vardeps], but we don't include MESON_LINK_ARGS, which also affects meson.cross. In addition, we include TOOLCHAIN_OPTIONS, from which both are derived. Add MESON_LINK_ARGS, and remove TOOLCHAIN_OPTIONS, which does not directly appear in meson.cross and should be pulled in indirectly by MESON_C_ARGS and MESON_LINK_ARGS. Signed-off-by: Martin Kelly Signed-off-by: Ross Burton --- meta/classes/meson.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 4ab242dcfd..91ac652651 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -44,7 +44,7 @@ def meson_array(var, d): return "', '".join(d.getVar(var).split()).join(("'", "'")) addtask write_config before do_configure -do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS TOOLCHAIN_OPTIONS" +do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS" do_write_config() { # This needs to be Py to split the args into single-element lists cat >${WORKDIR}/meson.cross <