From db8bc299947ef091eb710f066d3d4de68aa6a674 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 22 May 2020 15:45:34 -0600
Subject: [PATCH] Build redoxfs and installer outside of build environment

---
 mk/filesystem.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mk/filesystem.mk b/mk/filesystem.mk
index 37c978b..e215cb3 100644
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@@ -1,11 +1,12 @@
 build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix
+	cargo build --manifest-path redoxfs/Cargo.toml --release
+	cargo build --manifest-path installer/Cargo.toml --release
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf $@  $@.partial build/filesystem/
 	dd if=/dev/zero of=$@.partial bs=1048576 count="$(FILESYSTEM_SIZE)"
 	cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-mkfs $@.partial
 	mkdir -p build/filesystem/
-	cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
-	cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- $@.partial build/filesystem/
+	redoxfs/target/release/redoxfs $@.partial build/filesystem/
 	sleep 2
 	pgrep redoxfs
 	cp $< build/filesystem/filesystem.toml
@@ -14,7 +15,7 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix
 	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
 	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
 	export PATH="$(PREFIX_PATH):$$PATH" && \
-	cargo run --manifest-path installer/Cargo.toml --release -- $(INSTALLER_FLAGS) -c $< build/filesystem/
+ 	installer/target/release/redox_installer $(INSTALLER_FLAGS) -c $< build/filesystem/
 	sync
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf build/filesystem/
@@ -23,14 +24,14 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix
 mount: FORCE
 	mkdir -p build/filesystem/
 	cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
-	cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- build/harddrive.bin build/filesystem/
+	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
-	cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- build/extra.bin build/filesystem/
+	redoxfs/target/release/redoxfs build/extra.bin build/filesystem/
 	sleep 2
 	pgrep redoxfs