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

Drop rust freestanding step

Browse source
This commit is contained in:
Jeremy Soller 2025-01-14 12:28:58 -07:00
parent ae378d46f3
commit cde151ccb7
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 5 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
mk/prefix.mk
View file

@ -136,13 +136,9 @@ else
$(ROOT)/rust/configure: $(ROOT)/rust/configure:
git submodule update --progress --init --recursive --checkout rust git submodule update --progress --init --recursive --checkout rust
PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install
PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install
PREFIX_BASE_PATH=$(ROOT)/$(PREFIX_BASE_INSTALL)/bin
PREFIX_FREESTANDING_PATH=$(ROOT)/$(PREFIX_FREESTANDING_INSTALL)/bin PREFIX_FREESTANDING_PATH=$(ROOT)/$(PREFIX_FREESTANDING_INSTALL)/bin
$(PREFIX)/binutils-$(BINUTILS_BRANCH).tar.bz2: $(PREFIX)/binutils-$(BINUTILS_BRANCH).tar.bz2:
mkdir -p "$(@D)" mkdir -p "$(@D)"
rm -fv $(PREFIX)/binutils*.tar.bz2* rm -fv $(PREFIX)/binutils*.tar.bz2*
@ -220,37 +216,6 @@ else
mv "$@.partial" "$@" mv "$@.partial" "$@"
endif endif
$(PREFIX)/rust-freestanding-install: $(ROOT)/rust/configure | $(PREFIX)/binutils-install $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@
else
rm -rf "$(PREFIX)/rust-freestanding-build" "$@.partial" "$@"
mkdir -p "$(PREFIX)/rust-freestanding-build"
cp -r "$(PREFIX)/binutils-install" "$@.partial"
cd "$(PREFIX)/rust-freestanding-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
"$<" \
--prefix="/" \
--disable-docs \
--disable-download-ci-llvm \
--enable-cargo-native-static \
--enable-extended \
--enable-lld \
--enable-llvm-static-stdcpp \
--set 'llvm.targets=AArch64;X86;RISCV' \
--set 'llvm.experimental-targets=' \
--tools=cargo,src \
&& \
$(MAKE) -j `$(NPROC)` && \
$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"
rm -rf "$(PREFIX)/rust-freestanding-build"
mkdir -p "$@.partial/lib/rustlib/$(HOST_TARGET)/bin"
mkdir -p "$@.partial/lib/rustlib/$(HOST_TARGET)/lib"
cd "$@.partial" && $(PREFIX_STRIP)
touch "$@.partial"
mv "$@.partial" "$@"
endif
$(PREFIX)/relibc-freestanding: $(ROOT)/relibc $(PREFIX)/relibc-freestanding: $(ROOT)/relibc
mkdir -p "$(@D)" mkdir -p "$(@D)"
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
@ -259,19 +224,19 @@ $(PREFIX)/relibc-freestanding: $(ROOT)/relibc
mv "$@.partial" "$@" mv "$@.partial" "$@"
$(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc-freestanding | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG) $(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc-freestanding | $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
else else
rm -rf "$@.partial" "$@" rm -rf "$@.partial" "$@"
mkdir -p "$@.partial" mkdir -p "$@.partial"
cd "$<" && \ cd "$<" && \
export PATH="$(PREFIX_BASE_PATH):$(PREFIX_FREESTANDING_PATH):$$PATH" && \ export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \
export CARGO="env -u CARGO -u RUSTUP_TOOLCHAIN cargo" && \ export CARGO="env -u CARGO -u RUSTUP_TOOLCHAIN cargo" && \
export CC_$(subst -,_,$(TARGET))="$(GNU_TARGET)-gcc -isystem $(ROOT)/$@.partial/$(GNU_TARGET)/include" && \ export CC_$(subst -,_,$(TARGET))="$(GNU_TARGET)-gcc -isystem $(ROOT)/$@.partial/$(GNU_TARGET)/include" && \
$(MAKE) clean && \ $(MAKE) clean && \
$(MAKE) -j `$(NPROC)` all && \ $(MAKE) -j 1 all && \
$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(GNU_TARGET)" $(MAKE) -j 1 install DESTDIR="$(ROOT)/$@.partial/$(GNU_TARGET)"
cd "$@.partial" && $(PREFIX_STRIP) cd "$@.partial" && $(PREFIX_STRIP)
touch "$@.partial" touch "$@.partial"
mv "$@.partial" "$@" mv "$@.partial" "$@"
@ -283,7 +248,7 @@ ifeq ($(PODMAN_BUILD),1)
else else
rm -rf "$<-build" "$@.partial" "$@" rm -rf "$<-build" "$@.partial" "$@"
mkdir -p "$<-build" mkdir -p "$<-build"
cp -r "$(PREFIX_BASE_INSTALL)" "$@.partial" cp -r "$(PREFIX)/binutils-install" "$@.partial"
cd "$<-build" && \ cd "$<-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
"$(ROOT)/$</configure" \ "$(ROOT)/$</configure" \