From 85d75b7681a07e68ac36f51eaba144ebf8f7ca14 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 26 Jul 2022 12:05:53 -0600
Subject: [PATCH] Use HOST_CARGO variable for compiling binaries on the host

---
 mk/config.mk     |  1 +
 mk/filesystem.mk | 12 ++++++------
 mk/initfs.mk     |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mk/config.mk b/mk/config.mk
index 8897ecc..808faee 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -13,6 +13,7 @@ FILESYSTEM_SIZE?=256
 REDOXFS_MKFS_FLAGS?=
 
 # Per host variables
+HOST_CARGO=env --unset=RUSTUP_TOOLCHAIN cargo
 UNAME := $(shell uname)
 ifeq ($(UNAME),Darwin)
 	FUMOUNT=sudo umount
diff --git a/mk/filesystem.mk b/mk/filesystem.mk
index ca22563..713b848 100644
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@@ -1,11 +1,11 @@
 build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/initfs.img
-	cargo build --manifest-path cookbook/Cargo.toml --release
-	cargo build --manifest-path installer/Cargo.toml --release
-	cargo build --manifest-path redoxfs/Cargo.toml --release
+	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
+	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
+	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf $@  $@.partial build/filesystem/
 	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
-	cargo run --release \
+	$(HOST_CARGO) run --release \
 		--manifest-path redoxfs/Cargo.toml \
 		--bin redoxfs-mkfs \
 		-- $(REDOXFS_MKFS_FLAGS) $@.partial
@@ -28,14 +28,14 @@ build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/initfs.i
 
 mount: FORCE
 	mkdir -p build/filesystem/
-	cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
+	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
 	redoxfs/target/release/redoxfs build/harddrive.bin build/filesystem/
 	sleep 2
 	pgrep redoxfs
 
 mount_extra: FORCE
 	mkdir -p build/filesystem/
-	cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
+	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
 	redoxfs/target/release/redoxfs build/extra.bin build/filesystem/
 	sleep 2
 	pgrep redoxfs
diff --git a/mk/initfs.mk b/mk/initfs.mk
index 75a7d57..aed1d3e 100644
--- a/mk/initfs.mk
+++ b/mk/initfs.mk
@@ -3,8 +3,8 @@ INITFS_RM_BINS=\
 	redoxfs-mkfs
 
 build/initfs.img: initfs.toml prefix
-	cargo build --manifest-path cookbook/Cargo.toml --release
-	cargo build --manifest-path installer/Cargo.toml --release
+	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
+	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
 	rm -rf build/initfs
 	mkdir -p build/initfs
 	$(INSTALLER) -c $< build/initfs/