From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 5 Aug 2022 12:48:39 +0000 (+0100)
Subject: rust-common: Set rustlibdir to match target expectation
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06af65757b7694df983b3f99cec75e4e9bec0725;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

rust-common: Set rustlibdir to match target expectation

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass
index 516b258c15e..8ee05f57f86 100644
--- a/meta/classes/rust-common.bbclass
+++ b/meta/classes/rust-common.bbclass
@@ -2,12 +2,12 @@ inherit python3native
 inherit rust-target-config
 
 # Common variables used by all Rust builds
-export rustlibdir = "${libdir}/rust"
+export rustlibdir = "${libdir}/rustlib/${RUST_HOST_SYS}/lib"
 FILES:${PN} += "${rustlibdir}/*.so"
 FILES:${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta"
 FILES:${PN}-dbg += "${rustlibdir}/.debug"
 
-RUSTLIB = "-L ${STAGING_LIBDIR}/rust"
+RUSTLIB = "-L ${STAGING_DIR_HOST}${rustlibdir}"
 RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
 RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}"
 RUSTLIB_DEP ?= "libstd-rs"