From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 25 Feb 2021 13:55:16 +0000 (+0000)
Subject: rust: Remove LLVM tools
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7005ce84221354cadaebc46e708063d94ef2bde;p=people%2Fms%2Fipfire-2.x.git

rust: Remove LLVM tools

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/i586/rust b/config/rootfiles/common/i586/rust
index 5b3b498b53..4592d661f7 100644
--- a/config/rootfiles/common/i586/rust
+++ b/config/rootfiles/common/i586/rust
@@ -25,8 +25,6 @@
 #usr/lib/rustlib/etc/rust_types.py
 #usr/lib/rustlib/i686-unknown-linux-gnu
 #usr/lib/rustlib/i686-unknown-linux-gnu/bin
-#usr/lib/rustlib/i686-unknown-linux-gnu/bin/rust-lld
-#usr/lib/rustlib/i686-unknown-linux-gnu/bin/rust-llvm-dwp
 #usr/lib/rustlib/i686-unknown-linux-gnu/lib
 #usr/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-1110d28274a5a558.rlib
 #usr/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-4b1049af3d913803.rlib
diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust
index 421a7516c7..f21cdc9fd8 100644
--- a/config/rootfiles/common/x86_64/rust
+++ b/config/rootfiles/common/x86_64/rust
@@ -33,8 +33,6 @@
 #usr/lib/rustlib/uninstall.sh
 #usr/lib/rustlib/x86_64-unknown-linux-gnu
 #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-lld
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-llvm-dwp
 #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib
 #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-65e4f8df4b8bbd73.rlib
 #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-c0e64497deb085aa.rlib
diff --git a/lfs/rust b/lfs/rust
index 32b917ebb9..57cdd22908 100644
--- a/lfs/rust
+++ b/lfs/rust
@@ -91,5 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--prefix=/usr \
 		--disable-ldconfig
 
+	# Remove LLVM tools
+	rm -vf /usr/lib/rustlib/$(RUST_BOOTSTRAP)/bin/rust-ll{d,vm-dwp}
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)