diff options
| author | Martin Kelly <mkelly@xevo.com> | 2018-01-17 11:22:57 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-19 12:37:14 +0000 |
| commit | 9ce6fa9a8f7fc3e6e840e835e2eccff6a31096d6 (patch) | |
| tree | 6dfbe77497641c8ee47e8978f3c0721f96b076d4 /meta/classes | |
| parent | ff5634ad88a1d45a4b52f33afbb1e057fbf45ea9 (diff) | |
| download | poky-9ce6fa9a8f7fc3e6e840e835e2eccff6a31096d6.tar.gz | |
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.
(From OE-Core rev: 4db37cc8d9139076682e2528d29e92fad2eb1c90)
Signed-off-by: Martin Kelly <mkelly@xevo.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/meson.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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): | |||
| 44 | return "', '".join(d.getVar(var).split()).join(("'", "'")) | 44 | return "', '".join(d.getVar(var).split()).join(("'", "'")) |
| 45 | 45 | ||
| 46 | addtask write_config before do_configure | 46 | addtask write_config before do_configure |
| 47 | do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS TOOLCHAIN_OPTIONS" | 47 | do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS" |
| 48 | do_write_config() { | 48 | do_write_config() { |
| 49 | # This needs to be Py to split the args into single-element lists | 49 | # This needs to be Py to split the args into single-element lists |
| 50 | cat >${WORKDIR}/meson.cross <<EOF | 50 | cat >${WORKDIR}/meson.cross <<EOF |