diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 13:48:39 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:44:20 +0100 |
| commit | 1b7b5c37598b4475075b4e526277e5eb63d2a77c (patch) | |
| tree | 0cea8be3b7762da9f511da260594c512f2a82364 /meta/classes | |
| parent | 251f55374d26b5c24d8833aa87c95432be8b81b2 (diff) | |
| download | poky-1b7b5c37598b4475075b4e526277e5eb63d2a77c.tar.gz | |
rust-common: Set rustlibdir to match target expectation
(From OE-Core rev: 06af65757b7694df983b3f99cec75e4e9bec0725)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/rust-common.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass index 516b258c15..8ee05f57f8 100644 --- a/meta/classes/rust-common.bbclass +++ b/meta/classes/rust-common.bbclass | |||
| @@ -2,12 +2,12 @@ inherit python3native | |||
| 2 | inherit rust-target-config | 2 | inherit rust-target-config |
| 3 | 3 | ||
| 4 | # Common variables used by all Rust builds | 4 | # Common variables used by all Rust builds |
| 5 | export rustlibdir = "${libdir}/rust" | 5 | export rustlibdir = "${libdir}/rustlib/${RUST_HOST_SYS}/lib" |
| 6 | FILES:${PN} += "${rustlibdir}/*.so" | 6 | FILES:${PN} += "${rustlibdir}/*.so" |
| 7 | FILES:${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta" | 7 | FILES:${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta" |
| 8 | FILES:${PN}-dbg += "${rustlibdir}/.debug" | 8 | FILES:${PN}-dbg += "${rustlibdir}/.debug" |
| 9 | 9 | ||
| 10 | RUSTLIB = "-L ${STAGING_LIBDIR}/rust" | 10 | RUSTLIB = "-L ${STAGING_DIR_HOST}${rustlibdir}" |
| 11 | RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" | 11 | RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" |
| 12 | RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}" | 12 | RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}" |
| 13 | RUSTLIB_DEP ?= "libstd-rs" | 13 | RUSTLIB_DEP ?= "libstd-rs" |