diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2023-11-16 23:48:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-20 15:30:53 +0000 |
commit | d7a8a51cf569192d33e753d0e5375ef8152b8986 (patch) | |
tree | 5f4d3f491d17e0b1f91b3f398997040ee1c6536c | |
parent | c8d40d079ea7bca779163a5d968b1f28ae776fa3 (diff) | |
download | poky-d7a8a51cf569192d33e753d0e5375ef8152b8986.tar.gz |
rust: drop PE, PR from /usr/src/debug paths
(From OE-Core rev: e4931b1d6f147fc7ced080e30c63f0aaf0d1e7ff)
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-recipe/rust-common.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/cargo_1.70.0.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes-recipe/rust-common.bbclass b/meta/classes-recipe/rust-common.bbclass index 878272721c..3d73a370ec 100644 --- a/meta/classes-recipe/rust-common.bbclass +++ b/meta/classes-recipe/rust-common.bbclass | |||
@@ -14,7 +14,7 @@ FILES:${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta" | |||
14 | FILES:${PN}-dbg += "${rustlibdir}/.debug" | 14 | FILES:${PN}-dbg += "${rustlibdir}/.debug" |
15 | 15 | ||
16 | RUSTLIB = "-L ${STAGING_DIR_HOST}${rustlibdir}" | 16 | RUSTLIB = "-L ${STAGING_DIR_HOST}${rustlibdir}" |
17 | RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" | 17 | RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=${TARGET_DBGSRC_DIR}" |
18 | RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}" | 18 | RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}" |
19 | RUSTLIB_DEP ?= "libstd-rs" | 19 | RUSTLIB_DEP ?= "libstd-rs" |
20 | RUST_PANIC_STRATEGY ?= "unwind" | 20 | RUST_PANIC_STRATEGY ?= "unwind" |
diff --git a/meta/recipes-devtools/rust/cargo_1.70.0.bb b/meta/recipes-devtools/rust/cargo_1.70.0.bb index a5c1064106..50b7e7c7b4 100644 --- a/meta/recipes-devtools/rust/cargo_1.70.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.70.0.bb | |||
@@ -19,7 +19,7 @@ CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" | |||
19 | 19 | ||
20 | inherit cargo pkgconfig | 20 | inherit cargo pkgconfig |
21 | 21 | ||
22 | DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" | 22 | DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=${TARGET_DBGSRC_DIR}" |
23 | 23 | ||
24 | do_cargo_setup_snapshot () { | 24 | do_cargo_setup_snapshot () { |
25 | ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig | 25 | ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig |