From 56ac84977120a8b4dc2ee66e68ae733f59f8ef24 Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Sat, 3 Sep 2016 10:30:29 -0400 Subject: [PATCH] rust-cross: use base_libdir_native This fixes rust-cross-aarch64 (and probably rust-cross-x86_64) since those targets will use lib64 for cross but lib for native. --- recipes-devtools/rust/rust-cross.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-devtools/rust/rust-cross.bb b/recipes-devtools/rust/rust-cross.bb index 70ce2b4..36c0bb3 100644 --- a/recipes-devtools/rust/rust-cross.bb +++ b/recipes-devtools/rust/rust-cross.bb @@ -39,11 +39,11 @@ do_compile () { } do_install () { - mkdir -p ${D}${prefix}/${baselib}/rustlib - cp ${WORKDIR}/targets/${TARGET_ARCH}* ${D}${prefix}/${baselib}/rustlib + mkdir -p ${D}${prefix}/${base_libdir_native}/rustlib + cp ${WORKDIR}/targets/${TARGET_ARCH}* ${D}${prefix}/${base_libdir_native}/rustlib } rust_cross_sysroot_preprocess() { - sysroot_stage_dir ${D}${prefix}/${baselib}/rustlib ${SYSROOT_DESTDIR}${prefix}/${baselib}/rustlib + sysroot_stage_dir ${D}${prefix}/${base_libdir_native}/rustlib ${SYSROOT_DESTDIR}${prefix}/${base_libdir_native}/rustlib } SYSROOT_PREPROCESS_FUNCS += "rust_cross_sysroot_preprocess"