1 files changed, 8 insertions, 6 deletions

diff --git a/meta/classes-recipe/cargo.bbclass b/meta/classes-recipe/cargo.bbclass
index 0829a58dd9..2dd28e95d3 100644
--- a/meta/classes-recipe/cargo.bbclass
+++ b/meta/classes-recipe/cargo.bbclass
@@ -42,13 +42,13 @@ CARGO_BUILD_FLAGS = "-v --frozen --target ${RUST_HOST_SYS} ${BUILD_MODE} --manif
 # This is based on the content of CARGO_BUILD_FLAGS and generally will need to
 # change if CARGO_BUILD_FLAGS changes.
 BUILD_DIR = "${@['release', 'debug'][d.getVar('DEBUG_BUILD') == '1']}"
-CARGO_TARGET_SUBDIR="${RUST_HOST_SYS}/${BUILD_DIR}"
+CARGO_TARGET_SUBDIR = "${RUST_HOST_SYS}/${BUILD_DIR}"
 oe_cargo_build () {
         export RUSTFLAGS="${RUSTFLAGS}"
         bbnote "Using rust targets from ${RUST_TARGET_PATH}"
         bbnote "cargo = $(which ${CARGO})"
-        bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} $@"
-        "${CARGO}" build ${CARGO_BUILD_FLAGS} "$@"
+        bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} ${PACKAGECONFIG_CONFARGS} $@"
+        "${CARGO}" build ${CARGO_BUILD_FLAGS} ${PACKAGECONFIG_CONFARGS} "$@"
 }
 
 do_compile[progress] = "outof:\s+(\d+)/(\d+)"
@@ -61,9 +61,11 @@ cargo_do_install () {
         for tgt in "${B}/target/${CARGO_TARGET_SUBDIR}/"*; do
                 case $tgt in
                 *.so|*.rlib)
-                        install -d "${D}${rustlibdir}"
-                        install -m755 "$tgt" "${D}${rustlibdir}"
-                        have_installed=true
+                        if [ -n "${CARGO_INSTALL_LIBRARIES}" ]; then
+                                install -d "${D}${rustlibdir}"
+                                install -m755 "$tgt" "${D}${rustlibdir}"
+                                have_installed=true
+                        fi
                         ;;
                 *examples)
                         if [ -d "$tgt" ]; then