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

Include custom Rust when compiling with PREFIX_RUSTC

Browse source
This commit is contained in:
Jeremy Soller 2019-03-29 20:57:33 -06:00
parent 278478d42a
commit 6f6de7507b
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mk/prefix.mk
View file

@ -140,11 +140,11 @@ $(PREFIX)/rust-freestanding-install: $(ROOT)/rust | $(PREFIX)/binutils-install
mv "$@.partial" "$@" mv "$@.partial" "$@"
# TODO: Only make headers for freestanding install # TODO: Only make headers for freestanding install
$(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_INSTALL) $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL)
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
mkdir -p "$@.partial" mkdir -p "$@.partial"
cd "$<" && \ cd "$<" && \
export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \ export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
export CARGO=xargo && \ export CARGO=xargo && \
make -j `$(NPROC)` all && \ make -j `$(NPROC)` all && \
make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)" make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)"
@ -155,7 +155,7 @@ $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_IN
$(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-freestanding-install $(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-freestanding-install
rm -rf "$<-build" "$@.partial" "$@" rm -rf "$<-build" "$@.partial" "$@"
mkdir -p "$<-build" mkdir -p "$<-build"
cp -r "$(PREFIX)/binutils-install" "$@.partial" cp -r "$(PREFIX_BASE_INSTALL)" "$@.partial"
cd "$<-build" && \ cd "$<-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
"$(ROOT)/$</configure" \ "$(ROOT)/$</configure" \