From da380dd368d9904abf67cfde6648647e71fa47b4 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Tue, 9 Jan 2024 10:50:44 +0100 Subject: [PATCH] Don't rebuild lib/rustlib/src in the rust sysroot The prebuilt tarball already contains it now --- mk/prefix.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index 239aecd..74c97e6 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -37,12 +37,6 @@ else rm -rf "$@.partial/$(TARGET)/include/"* cp -r "$(PREFIX)/rust-install/$(TARGET)/include/c++" "$@.partial/$(TARGET)/include/c++" cp -r "$(PREFIX)/rust-install/lib/rustlib/$(HOST_TARGET)/lib/" "$@.partial/lib/rustlib/$(HOST_TARGET)/" -# Temporary hack to avoid breaking stuff before new pre-build prefix tarball with fixed rustlib/src is build and served at https://static.redox-os.org/toolchain/$(TARGET)/relibc-install.tar.gz -ifeq ($(PREFIX_BINARY),1) - rm -rf $@.partial/lib/rustlib/src - mkdir $@.partial/lib/rustlib/src - ln -s $(ROOT)/rust $@.partial/lib/rustlib/src -endif cd "$<" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export CARGO="env -u CARGO cargo" && \