From 12379a90b28603bbcf31058fb302233e196076ec Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 16 Dec 2018 15:15:25 -0700
Subject: [PATCH] Fix install rules
---
recipes/rust/recipe.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/recipes/rust/recipe.sh b/recipes/rust/recipe.sh
index 4eed33f58..18a5ebbf7 100644
--- a/recipes/rust/recipe.sh
+++ b/recipes/rust/recipe.sh
@@ -36,8 +36,9 @@ function recipe_stage {
binpath="$1/bin"
libpath="$1/lib/rustlib/${TARGET}/lib"
mkdir -p "$binpath" "$libpath"
- cp -fv "build/${TARGET}/stage2/bin/"* "$binpath"
+ cp -fv "build/"*"/stage2-rustc/${TARGET}/release/rustc_binary" "$binpath/rustc"
+ cp -fv "build/"*"/stage2-tools/${TARGET}/release/rustdoc_tool_binary" "$binpath/rustdoc"
+ cp -fv $(find "build/"*"/stage2/lib/rustlib/${TARGET}/lib/" -type f | grep -v librustc) "$libpath"
${STRIP} "$binpath/"*
- cp -fv $(find build/*/stage2/lib/rustlib/${TARGET}/lib/ -type f | grep -v librustc) "$libpath"
skip=1
}
--
GitLab