mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 06:49:33 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
251a5c88f6
commit
33477e1bbe
@@ -79,7 +79,7 @@ llvm-config = 'llvm-config'
|
|||||||
cups-config = 'cups-config'
|
cups-config = 'cups-config'
|
||||||
g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
|
g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
|
||||||
g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-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 ""}
|
${@"exe_wrapper = '${WORKDIR}/meson-qemuwrapper'" if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ""}
|
||||||
|
|
||||||
[built-in options]
|
[built-in options]
|
||||||
@@ -116,7 +116,7 @@ readelf = ${@meson_array('BUILD_READELF', d)}
|
|||||||
objcopy = ${@meson_array('BUILD_OBJCOPY', d)}
|
objcopy = ${@meson_array('BUILD_OBJCOPY', d)}
|
||||||
llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config'
|
llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config'
|
||||||
pkgconfig = 'pkg-config-native'
|
pkgconfig = 'pkg-config-native'
|
||||||
${@rust_tool(d, "BUILD_SYS")}
|
${@rust_tool(d, "RUST_BUILD_SYS")}
|
||||||
|
|
||||||
[built-in options]
|
[built-in options]
|
||||||
c_args = ${@meson_array('BUILD_CFLAGS', d)}
|
c_args = ${@meson_array('BUILD_CFLAGS', d)}
|
||||||
|
|||||||
Reference in New Issue
Block a user