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

Merge branch 'fix-prefix' into 'master'

Browse source 
Fix prefix

See merge request redox-os/redox!1213
This commit is contained in:
Jeremy Soller 2019-03-24 03:51:11 +00:00
parent f0c09396fd a5d04a31e3
commit 350e8ec353
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mk/prefix.mk
View file

@ -5,7 +5,7 @@ PREFIX_INSTALL=$(PREFIX)/relibc-install
ifeq ($(PREFIX_RUSTC),1)
PREFIX_FREESTANDING_INSTALL=$(PREFIX)/rust-freestanding-install
export RUSTUP_TOOLCHAIN=$(PREFIX)/rust-freestanding-install
export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/rust-freestanding-install
endif
PREFIX_FREESTANDING_PATH=$(ROOT)/$(PREFIX_FREESTANDING_INSTALL)/bin
@ -123,7 +123,7 @@ $(PREFIX)/rust-freestanding-install: $(ROOT)/rust | $(PREFIX)/gcc-freestanding-i
cp -r "$(PREFIX)/gcc-freestanding-install" "$@.partial"
cd "$(PREFIX)/rust-freestanding-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
"$</configure" --prefix="" --disable-docs && \
"$</configure" --prefix="/" --disable-docs && \
make -j `$(NPROC)` && \
make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"
rm -rf "$(PREFIX)/rust-freestanding-build"