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

Ensure that REDOXER_TOOLCHAIN is set for all makefile targets

Browse source
This commit is contained in:
Jeremy Soller 2021-07-18 20:48:01 -06:00
parent 4935d9f800
commit 17bf88b390
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mk/config.mk
View file

@ -51,7 +51,6 @@ KBUILD=build/kernel
export TARGET=$(ARCH)-unknown-redox export TARGET=$(ARCH)-unknown-redox
BUILD=build/userspace BUILD=build/userspace
INSTALLER=\ INSTALLER=\
export REDOXER_TOOLCHAIN="$(ROOT)/$(PREFIX_INSTALL)" && \
export PATH="$(PREFIX_PATH):$$PATH" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
installer/target/release/redox_installer $(INSTALLER_FLAGS) installer/target/release/redox_installer $(INSTALLER_FLAGS)

1
mk/prefix.mk
View file

@ -5,6 +5,7 @@ PREFIX_PATH=$(ROOT)/$(PREFIX_INSTALL)/bin
export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib
export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL) export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL)
export REDOXER_TOOLCHAIN=$(RUSTUP_TOOLCHAIN)
prefix: $(PREFIX_INSTALL) prefix: $(PREFIX_INSTALL)