mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustlib: libdir may be different between build and host

Browse Source 
With multilib, we may want to install under lib64 but the rust libraries
get published in the build sysroot under the libdir for the build
machine which is usually just lib. Support these being different.
This commit is contained in:
Tyler Hall
2016-01-08 16:16:26 -05:00
committed by Derek Straka
parent 49ea508249
commit bfb747de96
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/rust-bin.bbclass
+5 -1
View File
@@ -34,7 +34,11 @@ OVERLAP_DEPS = "${@get_overlap_deps(d)}"
# See https://github.com/rust-lang/rust/issues/19680 # See https://github.com/rust-lang/rust/issues/19680
RUSTC_FLAGS += "-C prefer-dynamic" RUSTC_FLAGS += "-C prefer-dynamic"
rustlib="${libdir}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/lib" rustlib_suffix="${TUNE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/lib"
# Native sysroot standard library path
rustlib_src="${prefix}/lib/${rustlib_suffix}"
# Host sysroot standard library path
rustlib="${libdir}/${rustlib_suffix}"
CRATE_NAME ?= "${@d.getVar('BPN', True).replace('-rs', '').replace('-', '_')}" CRATE_NAME ?= "${@d.getVar('BPN', True).replace('-rs', '').replace('-', '_')}"
BINNAME ?= "${BPN}" BINNAME ?= "${BPN}"
LIBNAME ?= "lib${CRATE_NAME}" LIBNAME ?= "lib${CRATE_NAME}"
recipes-devtools/rust/rustlib.bb
+1 -1
View File
@@ -9,7 +9,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}rust"
RUSTLIB_DEP = "" RUSTLIB_DEP = ""
do_install () { do_install () {
for f in ${STAGING_DIR_NATIVE}/${rustlib}/*.so; do for f in ${STAGING_DIR_NATIVE}/${rustlib_src}/*.so; do
echo Installing $f echo Installing $f
install -D -m 755 $f ${D}/${rustlib}/$(basename $f) install -D -m 755 $f ${D}/${rustlib}/$(basename $f)
done done