vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Set use PREFIX_RUSTC when using PREFIX_BINARY

Browse source
This commit is contained in:
Jeremy Soller 2019-04-20 10:37:26 -06:00
parent b1199b900f
commit 344f9b3044
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mk/config.mk
View file

@ -6,12 +6,7 @@ INSTALLER_FLAGS?=--cookbook=cookbook
## Enabled to use binary prefix (much faster) ## Enabled to use binary prefix (much faster)
PREFIX_BINARY?=1 PREFIX_BINARY?=1
## Enabled to build custom rustc ## Enabled to build custom rustc
ifeq ($(ARCH),aarch64) PREFIX_RUSTC?=1
# aarch64 requires rustc prefix
PREFIX_RUSTC?=1
else
PREFIX_RUSTC?=0
endif
## Filesystem size in MB (256 is the default) ## Filesystem size in MB (256 is the default)
FILESYSTEM_SIZE?=256 FILESYSTEM_SIZE?=256

6
mk/prefix.mk
View file

@ -6,7 +6,11 @@ PREFIX_INSTALL=$(PREFIX)/relibc-install
ifeq ($(PREFIX_RUSTC),1) ifeq ($(PREFIX_RUSTC),1)
PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install 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 endif
PREFIX_BASE_PATH=$(ROOT)/$(PREFIX_BASE_INSTALL)/bin PREFIX_BASE_PATH=$(ROOT)/$(PREFIX_BASE_INSTALL)/bin