From 52b8045fc5f995ae519aa103b73258d40e0b247b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 28 May 2020 16:39:56 -0600
Subject: [PATCH] Use gcc-install as base of rust-install and fix compilation
 of relibc-freestanding-install

---
 mk/prefix.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index fc9c1ac..b76e540 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -148,7 +148,7 @@ $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $
 	mkdir -p "$@.partial"
 	cd "$<" && \
 	export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
-	export CARGO="env -u CARGO xargo" && \
+	export CARGO="env -u CARGO -u RUSTUP_TOOLCHAIN xargo" && \
 	export CC_$(subst -,_,$(TARGET))="$(TARGET)-gcc -isystem $(ROOT)/$@.partial/$(TARGET)/include" && \
 	$(MAKE) -j `$(NPROC)` all && \
 	$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)"
@@ -192,10 +192,10 @@ $(PREFIX)/gcc-install.tar.gz: $(PREFIX)/gcc-install
 		--directory="$<" \
 		.
 
-$(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/relibc-freestanding-install
+$(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/gcc-install
 	rm -rf "$(PREFIX)/rust-build" "$@.partial" "$@"
 	mkdir -p "$(PREFIX)/rust-build"
-	cp -r "$(PREFIX)/relibc-freestanding-install" "$@.partial"
+	cp -r "$(PREFIX)/gcc-install" "$@.partial"
 	cd "$(PREFIX)/rust-build" && \
 	export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
 	"$</configure" \