From 33477e1bbea07402e62fe83c812fadc79f17309a Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 4 Nov 2023 21:54:25 +0300 Subject: meson: use correct targets for rust binaries Follow the example of rust and cargo classes and pass RUST_HOST_SYS and RUST_BUILD_SYS to rustc's --target argument instead of bare HOST_SYS and BUILD_SYS. (From OE-Core rev: 1471c6c076f544ccd6f0722c82878311199881a7) Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-recipe/meson.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index d08a83d555..a85d120d77 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -79,7 +79,7 @@ llvm-config = 'llvm-config' cups-config = 'cups-config' g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper' -${@rust_tool(d, "HOST_SYS")} +${@rust_tool(d, "RUST_HOST_SYS")} ${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""} [built-in options] @@ -116,7 +116,7 @@ readelf = ${@meson_array('BUILD_READELF', d)} objcopy = ${@meson_array('BUILD_OBJCOPY', d)} llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config' pkgconfig = 'pkg-config-native' -${@rust_tool(d, "BUILD_SYS")} +${@rust_tool(d, "RUST_BUILD_SYS")} [built-in options] c_args = ${@meson_array('BUILD_CFLAGS', d)} -- cgit v1.2.3-54-g00ecf