Compare commits

..

2 Commits

Author SHA1 Message Date
Jeremy Soller 2ff286050a Merge branch 'prefix-fix' into 'master'
Fix build of rust-install

See merge request redox-os/redox!1239
2020-06-18 17:41:26 +00:00
Mark Harris 3f3c8a23a3
Fix build of rust-install 2020-06-12 09:16:36 -07:00
1 changed files with 2 additions and 1 deletions

View File

@ -192,10 +192,11 @@ $(PREFIX)/gcc-install.tar.gz: $(PREFIX)/gcc-install
--directory="$<" \ --directory="$<" \
. .
$(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/gcc-install $(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/gcc-install $(PREFIX)/relibc-freestanding-install
rm -rf "$(PREFIX)/rust-build" "$@.partial" "$@" rm -rf "$(PREFIX)/rust-build" "$@.partial" "$@"
mkdir -p "$(PREFIX)/rust-build" mkdir -p "$(PREFIX)/rust-build"
cp -r "$(PREFIX)/gcc-install" "$@.partial" cp -r "$(PREFIX)/gcc-install" "$@.partial"
cp -r "$(PREFIX)/relibc-freestanding-install/$(TARGET)" "$@.partial"
cd "$(PREFIX)/rust-build" && \ cd "$(PREFIX)/rust-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
"$</configure" \ "$</configure" \