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 1/2] 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" && \

From 34acc9cb04bae1f8446b2fbf17d6eb3a9019c65f Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:19:06 +0100
Subject: [PATCH 2/2] Don't checkout rust submodule by default

It is no longer necessary for regular builds as of the previous commit.
This will drastically improve the time it takes to do the initial clone
of redox.
---
 .gitmodules  | 1 +
 mk/prefix.mk | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 3f4d88a..a43afd3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,7 @@
 	path = rust
 	url = https://gitlab.redox-os.org/redox-os/rust.git
 	branch = redox-2023-09-07
+	update = none
 [submodule "redoxfs"]
 	path = redoxfs
 	url = https://gitlab.redox-os.org/redox-os/redoxfs.git
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 74c97e6..9b84b3e 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -73,6 +73,9 @@ $(PREFIX)/rust-install: $(PREFIX)/rust-install.tar.gz
 
 else
 
+$(ROOT)/rust:
+	git submodule update --init --recursive --checkout rust
+
 PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install
 PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install