aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/classes
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2017-05-23 10:48:30 +0200
committerArmin Kuster <akuster808@gmail.com>2017-07-17 11:17:47 -0700
commit2eed84ca1e5c3be0441e918ebdd262183f38e79e (patch)
tree1c1b091af3cf89559d1671ae66be732f07b96cd8 /meta-oe/classes
parent1aa842b7af4236aea284dab3ec41a8feb59c6c11 (diff)
downloadmeta-openembedded-contrib-2eed84ca1e5c3be0441e918ebdd262183f38e79e.tar.gz
meson: Suport for c++ cross-compilation
cpp_args and cpp_link_args must be set on the meson.cross file to compile c++ applications. Otherwise variables such as the sysroot are not set correctly and libraries/headers are not found. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/classes')
-rw-r--r--meta-oe/classes/meson.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-oe/classes/meson.bbclass b/meta-oe/classes/meson.bbclass
index e27ed3906e..c33174a218 100644
--- a/meta-oe/classes/meson.bbclass
+++ b/meta-oe/classes/meson.bbclass
@@ -61,7 +61,9 @@ pkgconfig = 'pkg-config'
[properties]
c_args = [${@meson_array('MESON_C_ARGS', d)}]
+cpp_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}]
c_link_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}]
+cpp_link_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}]
[host_machine]
system = '${HOST_OS}'