summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe/meson.bbclass
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2023-11-04 21:54:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-11-06 16:49:21 +0000
commit33477e1bbea07402e62fe83c812fadc79f17309a (patch)
treeaa7a67ed32c4af7033dddbd426e8074f70fc810c /meta/classes-recipe/meson.bbclass
parent251a5c88f6bcf347d637b39b8a86e8a083774986 (diff)
downloadpoky-33477e1bbea07402e62fe83c812fadc79f17309a.tar.gz
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 <dmitry.baryshkov@linaro.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/meson.bbclass')
-rw-r--r--meta/classes-recipe/meson.bbclass4
1 files changed, 2 insertions, 2 deletions
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'
79cups-config = 'cups-config' 79cups-config = 'cups-config'
80g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' 80g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
81g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper' 81g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
82${@rust_tool(d, "HOST_SYS")} 82${@rust_tool(d, "RUST_HOST_SYS")}
83${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""} 83${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""}
84 84
85[built-in options] 85[built-in options]
@@ -116,7 +116,7 @@ readelf = ${@meson_array('BUILD_READELF', d)}
116objcopy = ${@meson_array('BUILD_OBJCOPY', d)} 116objcopy = ${@meson_array('BUILD_OBJCOPY', d)}
117llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config' 117llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config'
118pkgconfig = 'pkg-config-native' 118pkgconfig = 'pkg-config-native'
119${@rust_tool(d, "BUILD_SYS")} 119${@rust_tool(d, "RUST_BUILD_SYS")}
120 120
121[built-in options] 121[built-in options]
122c_args = ${@meson_array('BUILD_CFLAGS', d)} 122c_args = ${@meson_array('BUILD_CFLAGS', d)}