summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-09-01 12:21:40 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-09-01 12:21:40 +0200
commit49cc4528b4d31706796b8bb08e5d18db4b23db7c (patch)
tree590e6c45f15040e379896bc8560e3755da62c46c
parent6b8d273858d7911f00de3b365a2608e4612923bc (diff)
downloadrust-49cc4528b4d31706796b8bb08e5d18db4b23db7c.tar.gz
rust-49cc4528b4d31706796b8bb08e5d18db4b23db7c.tar.xz
rust: don't hardcode list of manifests for alternatives
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/dev-lang/rust/rust-build.exlib11
1 files changed, 3 insertions, 8 deletions
diff --git a/packages/dev-lang/rust/rust-build.exlib b/packages/dev-lang/rust/rust-build.exlib
index a2cc34c..00094c3 100644
--- a/packages/dev-lang/rust/rust-build.exlib
+++ b/packages/dev-lang/rust/rust-build.exlib
@@ -248,13 +248,6 @@ rust-build_src_install() {
local rustlib_alt_files=(
components
install.log
- manifest-cargo
- manifest-rls
- manifest-rustc
- manifest-rust-analysis-${RUST_TARGET}
- manifest-rust-docs
- manifest-rust-src
- manifest-rust-std-${RUST_TARGET}
rust-installer-version
uninstall.sh
)
@@ -269,9 +262,11 @@ rust-build_src_install() {
local dir
local f
- for f in "${rustlib_alt_files[@]}"; do
+ edo pushd "${rustlibdir}"
+ for f in "${rustlib_alt_files[@]}" manifest-*; do
alternatives+=( "${rustlibdir}/${f}" $(basename ${f} | sed -re 's/^([^-]*)(-?.*)$/\1-'${SLOT}'\2/') )
done
+ edo popd
for dir in "${alt_dirs[@]}"; do
edo pushd "${IMAGE}${dir}"
for f in *; do