Remove freestanding rust files as much as possible from rust install, build cargo only

This commit is contained in:
Jeremy Soller 2019-06-19 21:19:59 -06:00
parent b553383a8e
commit 2dd140995d
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1

View file

@ -64,13 +64,15 @@ $(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/relibc-install
--prefix="/" \ --prefix="/" \
--disable-docs \ --disable-docs \
--enable-extended \ --enable-extended \
--tools=cargo \
--target="$(TARGET)" \ --target="$(TARGET)" \
&& \ && \
make -j `$(NPROC)` && \ make -j `$(NPROC)` && \
rm -rf "$(ROOT)/$@.partial/lib/rustlib" "$(ROOT)/$@.partial/share/doc/rust" && \
make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial" make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"
rm -rf "$(PREFIX)/rust-build" rm -rf "$(PREFIX)/rust-build"
mkdir -p "$@.partial/lib/rustlib/x86_64-unknown-linux-gnu/bin" mkdir -p "$@.partial/lib/rustlib/x86_64-unknown-linux-gnu/bin"
cd "$@.partial" && $(PREFIX_STRIP) cd "$@.partial" && find . -name *.old -exec rm {} ';' && $(PREFIX_STRIP)
touch "$@.partial" touch "$@.partial"
mv "$@.partial" "$@" mv "$@.partial" "$@"
@ -170,6 +172,7 @@ $(PREFIX)/rust-freestanding-install: $(ROOT)/rust | $(PREFIX)/binutils-install
--prefix="/" \ --prefix="/" \
--disable-docs \ --disable-docs \
--enable-extended \ --enable-extended \
--tools=cargo \
&& \ && \
make -j `$(NPROC)` && \ make -j `$(NPROC)` && \
make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial" make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"