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

Remove PREFIX_RUSTC

Browse source
This commit is contained in:
Jeremy Soller 2020-05-22 16:00:40 -06:00
parent 5be4d46b50
commit 621066cb53
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mk/config.mk
View file

@ -5,8 +5,6 @@ ARCH?=x86_64
INSTALLER_FLAGS?=--cookbook=cookbook 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
PREFIX_RUSTC?=1
## Filesystem size in MB (256 is the default) ## Filesystem size in MB (256 is the default)
FILESYSTEM_SIZE?=256 FILESYSTEM_SIZE?=256

13
mk/prefix.mk
View file

@ -1,18 +1,15 @@
PREFIX=prefix/$(TARGET) PREFIX=prefix/$(TARGET)
PREFIX_BASE_INSTALL=$(PREFIX)/binutils-install PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install
PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install
PREFIX_INSTALL=$(PREFIX)/relibc-install PREFIX_INSTALL=$(PREFIX)/relibc-install
PREFIX_RELIBC_BASE=$(PREFIX)/gcc-install
ifeq ($(PREFIX_RUSTC),1) ifeq ($(PREFIX_BINARY),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 PREFIX_RELIBC_BASE=$(PREFIX)/rust-install
else export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/gcc-install
else
PREFIX_RELIBC_BASE=$(PREFIX)/gcc-install
export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/rust-freestanding-install 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