Skip to content

Commit 060e033

Browse files
committed
rust-common: fix remap-path-prefix for 1.26
Before the flag was stabilized, it required two arguments of the form "from=<from_path>" and "to=<to_path>" respectively. The stabilized version uses one argument of the form "<from_path>=<to_path>". Unfortunately the old format is still parsed successfully, but results in attempting to replace the literal paths "from" and "to". rust-lang/rust#41555 (comment)
1 parent 6d3f61e commit 060e033

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

classes/rust-common.bbclass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FILES_${PN}-dev += "${rustlibdir}/*.rlib"
55
FILES_${PN}-dbg += "${rustlibdir}/.debug"
66

77
RUSTLIB = "-L ${STAGING_LIBDIR}/rust"
8-
RUST_DEBUG_REMAP = "--remap-path-prefix=from=${WORKDIR} --remap-path-prefix=to=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
8+
RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
99
RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}"
1010
RUSTLIB_DEP ?= "libstd-rs"
1111
RUST_TARGET_PATH = "${STAGING_LIBDIR_NATIVE}/rustlib"

0 commit comments

Comments
 (0)