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

Update prefix logic from aarch64

Browse source
This commit is contained in:
Jeremy Soller 2018-11-27 19:55:15 -07:00
parent 9cece170b1
commit 373566aee5
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mk/prefix.mk
View file

@ -8,6 +8,7 @@ ifeq ($(PREFIX_RUSTC),1)
export RUSTUP_TOOLCHAIN=$(PREFIX)/rust-freestanding-install export RUSTUP_TOOLCHAIN=$(PREFIX)/rust-freestanding-install
endif endif
PREFIX_FREESTANDING_PATH=$(PREFIX_FREESTANDING_INSTALL)/bin
PREFIX_PATH=$(PREFIX_INSTALL)/bin PREFIX_PATH=$(PREFIX_INSTALL)/bin
prefix-freestanding: $(PREFIX_FREESTANDING_INSTALL) prefix-freestanding: $(PREFIX_FREESTANDING_INSTALL)
@ -68,13 +69,14 @@ $(PREFIX)/rust-freestanding-install: $(ROOT)/rust | $(PREFIX)/gcc-freestanding-i
"$</configure" --prefix="$@" --disable-docs && \ "$</configure" --prefix="$@" --disable-docs && \
make -j `nproc` && \ make -j `nproc` && \
make install -j `nproc` make install -j `nproc`
mkdir -p "$@/lib/rustlib/x86_64-unknown-linux-gnu/bin"
touch "$@" touch "$@"
$(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_INSTALL) $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_INSTALL)
rm -rf "$@" rm -rf "$@"
mkdir -p "$@" mkdir -p "$@"
cd "$<" && \ cd "$<" && \
export PATH="$@/bin:$$PATH" && \ export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \
make CARGO=xargo all && \ make CARGO=xargo all && \
make CARGO=xargo DESTDIR="$@/usr" install make CARGO=xargo DESTDIR="$@/usr" install
touch "$@" touch "$@"