From 2dd140995d06f1a427e08373188892a0aa9bf9b5 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 19 Jun 2019 21:19:59 -0600
Subject: [PATCH] Remove freestanding rust files as much as possible from rust
 install, build cargo only

---
 mk/prefix.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index ffccf24..dab73d4 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -64,13 +64,15 @@ $(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/relibc-install
 		--prefix="/" \
 		--disable-docs \
 		--enable-extended \
+		--tools=cargo \
 		--target="$(TARGET)" \
 		&& \
 	make -j `$(NPROC)` && \
+	rm -rf "$(ROOT)/$@.partial/lib/rustlib" "$(ROOT)/$@.partial/share/doc/rust" && \
 	make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"
 	rm -rf "$(PREFIX)/rust-build"
 	mkdir -p "$@.partial/lib/rustlib/x86_64-unknown-linux-gnu/bin"
-	cd "$@.partial" && $(PREFIX_STRIP)
+	cd "$@.partial" && find . -name *.old -exec rm {} ';' && $(PREFIX_STRIP)
 	touch "$@.partial"
 	mv "$@.partial" "$@"
 
@@ -170,6 +172,7 @@ $(PREFIX)/rust-freestanding-install: $(ROOT)/rust | $(PREFIX)/binutils-install
 		--prefix="/" \
 		--disable-docs \
 		--enable-extended \
+		--tools=cargo \
 		&& \
 	make -j `$(NPROC)` && \
 	make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"