diff options
Diffstat (limited to 'meta/recipes-devtools/rust/rust.inc')
-rw-r--r-- | meta/recipes-devtools/rust/rust.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index 6045ab4d42..dc92cf5fd0 100644 --- a/meta/recipes-devtools/rust/rust.inc +++ b/meta/recipes-devtools/rust/rust.inc | |||
@@ -50,6 +50,14 @@ do_rust_setup_snapshot () { | |||
50 | # and fail without it there. | 50 | # and fail without it there. |
51 | mkdir -p ${RUSTSRC}/build/${BUILD_SYS} | 51 | mkdir -p ${RUSTSRC}/build/${BUILD_SYS} |
52 | ln -sf ${WORKDIR}/rust-snapshot/ ${RUSTSRC}/build/${BUILD_SYS}/stage0 | 52 | ln -sf ${WORKDIR}/rust-snapshot/ ${RUSTSRC}/build/${BUILD_SYS}/stage0 |
53 | |||
54 | # Need to use uninative's loader if enabled/present since the library paths | ||
55 | # are used internally by rust and result in symbol mismatches if we don't | ||
56 | if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then | ||
57 | for bin in cargo rustc rustdoc; do | ||
58 | patchelf-uninative ${WORKDIR}/rust-snapshot/bin/$bin --set-interpreter ${UNINATIVE_LOADER} | ||
59 | done | ||
60 | fi | ||
53 | } | 61 | } |
54 | addtask rust_setup_snapshot after do_unpack before do_configure | 62 | addtask rust_setup_snapshot after do_unpack before do_configure |
55 | do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot" | 63 | do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot" |