From f9823473e230eb987a7f0da605ab3c4efe1536e6 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 11 May 2024 14:37:47 -0600
Subject: [PATCH] Use target-specific folder for relibc source for freestanding
 build

---
 .gitmodules         | 2 +-
 mk/prefix.mk        | 2 +-
 rust                | 2 +-
 rust-toolchain.toml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a43afd3..80dc287 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 [submodule "rust"]
 	path = rust
 	url = https://gitlab.redox-os.org/redox-os/rust.git
-	branch = redox-2023-09-07
+	branch = redox-2024-05-11
 	update = none
 [submodule "redoxfs"]
 	path = redoxfs
diff --git a/mk/prefix.mk b/mk/prefix.mk
index fd0395c..93906b5 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -185,7 +185,7 @@ else
 	mv "$@.partial" "$@"
 endif
 
-$(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG)
+$(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
diff --git a/rust b/rust
index e9ed31b..baab349 160000
--- a/rust
+++ b/rust
@@ -1 +1 @@
-Subproject commit e9ed31b0540da8c7eae71de353a741294139ae8b
+Subproject commit baab3498eb8cfe762e7d3009467cf70069871aba
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index f8ecc00..46893dd 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-09-07"
+channel = "nightly-2024-05-11"
 components = ["rust-src"]