From 604f1c11a28a6a22bf5e8b15dc851d0e03dea408 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 2 Jun 2020 08:35:37 -0600
Subject: [PATCH] Build xargo locally

---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 02a4cef3ac..4987110f74 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,16 @@ TARGET?=
 
 CARGO?=cargo
 CARGO_TEST?=$(CARGO)
-CARGOFLAGS=
-RUSTCFLAGS=
+CARGOFLAGS?=
+RUSTCFLAGS?=
+
+# When using xargo, build it in local location
+export XARGO_HOME=$(CURDIR)/target/xargo
 
 BUILD=target
 ifneq ($(TARGET),)
 	BUILD="target/$(TARGET)"
-	CARGOFLAGS="--target=$(TARGET)"
+	CARGOFLAGS+="--target=$(TARGET)"
 endif
 
 ifeq ($(TARGET),aarch64-unknown-linux-gnu)