diff options
author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2023-11-04 21:54:25 +0300 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-12-15 03:54:00 -1000 |
commit | 825972095a52ed5a6f67c044dc83df31ede19410 (patch) | |
tree | 8bc2ec91f311c267fc06d2f1b0b6c8359b8bf70a | |
parent | 1a47e21fff905fc1883d506b09add6ba0af56f00 (diff) | |
download | poky-825972095a52ed5a6f67c044dc83df31ede19410.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: ea5e46a627dc7385c4d7732299618b6392b7a407)
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 1471c6c076f544ccd6f0722c82878311199881a7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/classes-recipe/meson.bbclass | 4 |
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' | |||
79 | cups-config = 'cups-config' | 79 | cups-config = 'cups-config' |
80 | g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' | 80 | g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' |
81 | g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper' | 81 | g-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)} | |||
116 | objcopy = ${@meson_array('BUILD_OBJCOPY', d)} | 116 | objcopy = ${@meson_array('BUILD_OBJCOPY', d)} |
117 | llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config' | 117 | llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config' |
118 | pkgconfig = 'pkg-config-native' | 118 | pkgconfig = '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] |
122 | c_args = ${@meson_array('BUILD_CFLAGS', d)} | 122 | c_args = ${@meson_array('BUILD_CFLAGS', d)} |