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

Set relibc base depending on PREFIX_BINARY and PREFIX_RUSTC

Browse source
This commit is contained in:
Jeremy Soller 2020-05-22 15:55:19 -06:00
parent 75c7456141
commit 5be4d46b50
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mk/prefix.mk
View file

@ -3,11 +3,13 @@ PREFIX=prefix/$(TARGET)
PREFIX_BASE_INSTALL=$(PREFIX)/binutils-install PREFIX_BASE_INSTALL=$(PREFIX)/binutils-install
PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install
PREFIX_INSTALL=$(PREFIX)/relibc-install PREFIX_INSTALL=$(PREFIX)/relibc-install
PREFIX_RELIBC_BASE=$(PREFIX)/gcc-install
ifeq ($(PREFIX_RUSTC),1) ifeq ($(PREFIX_RUSTC),1)
PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install
ifeq ($(PREFIX_BINARY),1) ifeq ($(PREFIX_BINARY),1)
export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/gcc-install export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/gcc-install
PREFIX_RELIBC_BASE=$(PREFIX)/rust-install
else else
export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/rust-freestanding-install export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX)/rust-freestanding-install
endif endif
@ -32,11 +34,11 @@ PREFIX_STRIP=\
-exec strip --strip-unneeded {} ';' \ -exec strip --strip-unneeded {} ';' \
2> /dev/null 2> /dev/null
$(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/rust-install $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX_RELIBC_BASE)
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
cp -r "$(PREFIX)/rust-install" "$@.partial" cp -r "$(PREFIX_RELIBC_BASE)" "$@.partial"
rm -rf "$@.partial/$(TARGET)/include/"* rm -rf "$@.partial/$(TARGET)/include/"*
cp -r "$(PREFIX)/rust-install/$(TARGET)/include/c++" "$@.partial/$(TARGET)/include/c++" cp -r "$(PREFIX_RELIBC_BASE)/$(TARGET)/include/c++" "$@.partial/$(TARGET)/include/c++"
cd "$<" && \ cd "$<" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
export CARGO="env -u CARGO xargo" && \ export CARGO="env -u CARGO xargo" && \