From 9c1ea2dc23107598ee64b6be90e0d0febcb60842 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 20 Nov 2025 12:30:56 -0700
Subject: [PATCH] Use relibc source from cookbook

---
 .gitmodules  | 4 ----
 mk/prefix.mk | 8 ++++++--
 relibc       | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 160000 relibc

diff --git a/.gitmodules b/.gitmodules
index 450890410..9745aec0d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,7 +7,3 @@
 	url = https://gitlab.redox-os.org/redox-os/rust.git
 	branch = redox-2025-01-12
 	update = none
-[submodule "relibc"]
-	path = relibc
-	url = https://gitlab.redox-os.org/redox-os/relibc.git
-	branch = master
diff --git a/mk/prefix.mk b/mk/prefix.mk
index f4e3860ab..b23eaba2c 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -4,6 +4,7 @@ PREFIX=prefix/$(TARGET)
 
 PREFIX_INSTALL=$(PREFIX)/sysroot/
 PREFIX_PATH=$(ROOT)/$(PREFIX_INSTALL)/bin
+RELIBC_SOURCE=cookbook/recipes/core/relibc/source
 
 BINUTILS_BRANCH=redox-2.43.1
 GCC_BRANCH=redox-13.2.0
@@ -35,7 +36,10 @@ PREFIX_STRIP=\
 		-exec strip --strip-unneeded {} ';' \
 		2> /dev/null
 
-$(PREFIX)/relibc: $(ROOT)/relibc
+$(RELIBC_SOURCE): $(FSTOOLS_TAG)
+	cd ./cookbook && ./target/release/repo fetch relibc
+
+$(PREFIX)/relibc: $(RELIBC_SOURCE)
 	mkdir -p "$(@D)"
 	rm -rf "$@.partial" "$@"
 	cp -r "$^" "$@.partial"
@@ -235,7 +239,7 @@ else
 	mv "$@.partial" "$@"
 endif
 
-$(PREFIX)/relibc-freestanding: $(ROOT)/relibc
+$(PREFIX)/relibc-freestanding: $(RELIBC_SOURCE)
 	mkdir -p "$(@D)"
 	rm -rf "$@.partial" "$@"
 	cp -r "$^" "$@.partial"
diff --git a/relibc b/relibc
deleted file mode 160000
index 01f01d3bd..000000000
--- a/relibc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 01f01d3bd49df5af52e0beaff168795a3d70ec28