diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-01 11:37:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-02 21:22:54 +0100 |
commit | 640136a72b3bb6f832b08ca0e12f774c925d36c8 (patch) | |
tree | 34cb48ebb06d6bda594a5e93bf729e32a88ab92c /meta/recipes-devtools/cargo | |
parent | 1603585cd20e306313970c724976d45eaf56fe47 (diff) | |
download | poky-640136a72b3bb6f832b08ca0e12f774c925d36c8.tar.gz |
cargo: Apply uninative fix to snapshot as with rust
Also add the interpreter relocation trick from uninative to the prebuilt
cargo binary to match rust-native, just in case that causes other problems
later too.
(From OE-Core rev: e3cb3958cc14672feef5d4d8953131f55db68573)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cargo')
-rw-r--r-- | meta/recipes-devtools/cargo/cargo.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cargo/cargo.inc b/meta/recipes-devtools/cargo/cargo.inc index 6161c327e8..1cf7dd6214 100644 --- a/meta/recipes-devtools/cargo/cargo.inc +++ b/meta/recipes-devtools/cargo/cargo.inc | |||
@@ -20,6 +20,11 @@ inherit cargo | |||
20 | 20 | ||
21 | do_cargo_setup_snapshot () { | 21 | do_cargo_setup_snapshot () { |
22 | ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig | 22 | ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig |
23 | # Need to use uninative's loader if enabled/present since the library paths | ||
24 | # are used internally by rust and result in symbol mismatches if we don't | ||
25 | if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then | ||
26 | patchelf-uninative ${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo --set-interpreter ${UNINATIVE_LOADER} | ||
27 | fi | ||
23 | } | 28 | } |
24 | 29 | ||
25 | addtask cargo_setup_snapshot after do_unpack before do_configure | 30 | addtask cargo_setup_snapshot after do_unpack before do_configure |