From 5d256f4996880baf61e53c54dea8d0cddb47acba Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 11 Nov 2018 08:14:01 -0700
Subject: [PATCH] Use xargo to compile relibc, to allow patching of rust core
 and alloc

---
 mk/prefix.mk | 5 ++---
 relibc       | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index 4dba7f1..c9e02d2 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -55,9 +55,8 @@ $(PREFIX)/relibc-install: $(PREFIX)/binutils-install $(PREFIX)/gcc-freestanding-
 	rm -rf "$@"
 	cd relibc && \
 	export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \
-	rustup target add "$(TARGET)" && \
-	make all && \
-	make DESTDIR="$@/usr" install
+	make CARGO=xargo all && \
+	make CARGO=xargo DESTDIR="$@/usr" install
 	touch "$@"
 
 $(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-install
diff --git a/relibc b/relibc
index bf11118..2b3ae4d 160000
--- a/relibc
+++ b/relibc
@@ -1 +1 @@
-Subproject commit bf111188e17b502b77b399b28ac43189fd4d0e6a
+Subproject commit 2b3ae4d8b80c24003661711ae1d94aea0cfda9a9