From 1eb86e935c68d3782f8c81da3af1111eabb29c9b Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Thu, 2 Feb 2017 09:59:33 -0500 Subject: [PATCH] rust-bin: fix recent breakage The crate_hash flag is no longer accepted on rust 1.14. Additionally, due to the use of wrapper scripts by cargo, we were no longer able to link correctly due to some link flags getting dropped. Fix that as well --- classes/rust-bin.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/rust-bin.bbclass b/classes/rust-bin.bbclass index 28a210f..81c9952 100644 --- a/classes/rust-bin.bbclass +++ b/classes/rust-bin.bbclass @@ -3,8 +3,7 @@ inherit rust DEPENDS_append = " patchelf-native" RDEPENDS_${PN} += "${RUSTLIB_DEP}" -RUSTFLAGS += "-C crate_hash=${BB_TASKHASH}" -RUSTC_ARCHFLAGS += "-C opt-level=3 -g -L ${STAGING_DIR_HOST}/${rustlibdir}" +RUSTC_ARCHFLAGS += "-C opt-level=3 -g -L ${STAGING_DIR_HOST}/${rustlibdir} -C link-args=--sysroot=${STAGING_DIR_HOST}" EXTRA_OEMAKE += 'RUSTC_ARCHFLAGS="${RUSTC_ARCHFLAGS}"' # Some libraries alias with the standard library but libstd is configured to