From 4017ee6392d9b9918b61b15121e9eed0e662d1e0 Mon Sep 17 00:00:00 2001 From: Pgowda Date: Mon, 18 Oct 2021 21:37:25 -0700 Subject: [PATCH] rust-cross: Fix directory not deleted for race glibc vs. musl Use different recipe names for the two different targets so that when switching libcs overlapping files in the sysroot don't cause issues. (From OE-Core rev: 3c71fe1c487682950a115348cb8308e74c20e250) Signed-off-by: Pgowda Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 33be44a02beb7c52f075f660ad8e0641e360011c) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/rust-cross.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rust/rust-cross.inc b/meta/recipes-devtools/rust/rust-cross.inc index bee7c9f12f..33be83bf5a 100644 --- a/meta/recipes-devtools/rust/rust-cross.inc +++ b/meta/recipes-devtools/rust/rust-cross.inc @@ -32,7 +32,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs vir DEPENDS += "rust-native" PROVIDES = "virtual/${TARGET_PREFIX}rust" -PN = "rust-cross-${TARGET_ARCH}" +PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}" # In the cross compilation case, rustc doesn't seem to get the rpath quite # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't