From 621066cb53c238bb0f8b16eaba688151d8be1844 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 22 May 2020 16:00:40 -0600
Subject: [PATCH] Remove PREFIX_RUSTC

---
 mk/config.mk |  2 --
 mk/prefix.mk | 17 +++++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/mk/config.mk b/mk/config.mk
index ac4b113..5c68dfb 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -5,8 +5,6 @@ ARCH?=x86_64
 INSTALLER_FLAGS?=--cookbook=cookbook
 ## Enabled to use binary prefix (much faster)
 PREFIX_BINARY?=1
-## Enabled to build custom rustc
-PREFIX_RUSTC?=1
 ## Filesystem size in MB (256 is the default)
 FILESYSTEM_SIZE?=256
 
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 58c82eb..73791a9 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -1,18 +1,15 @@
 PREFIX=prefix/$(TARGET)
 
-PREFIX_BASE_INSTALL=$(PREFIX)/binutils-install
+PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install
 PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install
 PREFIX_INSTALL=$(PREFIX)/relibc-install
-PREFIX_RELIBC_BASE=$(PREFIX)/gcc-install
 
-ifeq ($(PREFIX_RUSTC),1)
-	PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install
-	ifeq ($(PREFIX_BINARY),1)
-		export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/gcc-install
-		PREFIX_RELIBC_BASE=$(PREFIX)/rust-install
-	else
-		export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/rust-freestanding-install
-	endif
+ifeq ($(PREFIX_BINARY),1)
+	PREFIX_RELIBC_BASE=$(PREFIX)/rust-install
+	export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/gcc-install
+else
+	PREFIX_RELIBC_BASE=$(PREFIX)/gcc-install
+	export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/rust-freestanding-install
 endif
 
 PREFIX_BASE_PATH=$(ROOT)/$(PREFIX_BASE_INSTALL)/bin