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

Use gcc-install as base of rust-install and fix compilation of relibc-freestanding-install

Browse source
This commit is contained in:
Jeremy Soller 2020-05-28 16:39:56 -06:00
parent 34d4e2dcfd
commit 52b8045fc5
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

@ -148,7 +148,7 @@ $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $
mkdir -p "$@.partial" mkdir -p "$@.partial"
cd "$<" && \ cd "$<" && \
export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \ export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
export CARGO="env -u CARGO xargo" && \ export CARGO="env -u CARGO -u RUSTUP_TOOLCHAIN xargo" && \
export CC_$(subst -,_,$(TARGET))="$(TARGET)-gcc -isystem $(ROOT)/$@.partial/$(TARGET)/include" && \ export CC_$(subst -,_,$(TARGET))="$(TARGET)-gcc -isystem $(ROOT)/$@.partial/$(TARGET)/include" && \
$(MAKE) -j `$(NPROC)` all && \ $(MAKE) -j `$(NPROC)` all && \
$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)" $(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)"
@ -192,10 +192,10 @@ $(PREFIX)/gcc-install.tar.gz: $(PREFIX)/gcc-install
--directory="$<" \ --directory="$<" \
. .
$(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/relibc-freestanding-install $(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/gcc-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)/relibc-freestanding-install" "$@.partial" cp -r "$(PREFIX)/gcc-install" "$@.partial"
cd "$(PREFIX)/rust-build" && \ cd "$(PREFIX)/rust-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
"$</configure" \ "$</configure" \