From 963447774810d24245ec8c26349c85f18f31dcae Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 21 Feb 2026 10:49:59 -0700
Subject: [PATCH] Fix prefix clang-install when using PREFIX_BINARY=1

---
 mk/prefix.mk | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index 9f1293898..32b253ba2 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -80,15 +80,6 @@ endif
 # PREFIX_BINARY ---------------------------------------------------
 ifeq ($(PREFIX_BINARY),1)
 
-$(PREFIX)/rust-install.tar.gz: | $(CONTAINER_TAG)
-ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) make $@
-else
-	mkdir -p "$(@D)"
-	wget -O $@.partial "https://static.redox-os.org/toolchain/$(HOST_TARGET)/$(TARGET)/rust-install.tar.gz"
-	mv $@.partial $@
-endif
-
 $(PREFIX)/gcc-install.tar.gz: | $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
@@ -109,6 +100,15 @@ else
 	mv "$@.partial" "$@"
 endif
 
+$(PREFIX)/rust-install.tar.gz: | $(CONTAINER_TAG)
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) make $@
+else
+	mkdir -p "$(@D)"
+	wget -O $@.partial "https://static.redox-os.org/toolchain/$(HOST_TARGET)/$(TARGET)/rust-install.tar.gz"
+	mv $@.partial $@
+endif
+
 $(PREFIX)/rust-install: $(PREFIX)/rust-install.tar.gz $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
@@ -120,6 +120,26 @@ else
 	mv "$@.partial" "$@"
 endif
 
+$(PREFIX)/clang-install.tar.gz: | $(CONTAINER_TAG)
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) make $@
+else
+	mkdir -p "$(@D)"
+	wget -O $@.partial "https://static.redox-os.org/toolchain/$(HOST_TARGET)/$(TARGET)/clang-install.tar.gz"
+	mv $@.partial $@
+endif
+
+$(PREFIX)/clang-install: $(PREFIX)/clang-install.tar.gz $(CONTAINER_TAG)
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) make $@
+else
+	rm -rf "$@.partial" "$@"
+	mkdir -p "$@.partial"
+	tar --extract --file "$<" --directory "$@.partial" --no-same-owner --strip-components=1
+	touch "$@.partial"
+	mv "$@.partial" "$@"
+endif
+
 else
 
 # BUILD GCC ---------------------------------------------------