diff --git a/mk/config.mk b/mk/config.mk index 65dd31a..5f6eace 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -6,12 +6,7 @@ INSTALLER_FLAGS?=--cookbook=cookbook ## Enabled to use binary prefix (much faster) PREFIX_BINARY?=1 ## Enabled to build custom rustc -ifeq ($(ARCH),aarch64) - # aarch64 requires rustc prefix - PREFIX_RUSTC?=1 -else - PREFIX_RUSTC?=0 -endif +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 d884baf..5b7be9f 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -6,7 +6,11 @@ PREFIX_INSTALL=$(PREFIX)/relibc-install ifeq ($(PREFIX_RUSTC),1) PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install - export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/rust-freestanding-install + ifeq ($(PREFIX_BINARY),1) + export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/gcc-install + else + export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/rust-freestanding-install + endif endif PREFIX_BASE_PATH=$(ROOT)/$(PREFIX_BASE_INSTALL)/bin