From 947e877b2ce9e09e474f9fd6b1a64e8013004347 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Wed, 24 Dec 2025 23:39:46 +0700
Subject: [PATCH] Uncomment experimental, use unzipped gcc

---
 mk/config.mk | 2 +-
 mk/prefix.mk | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk/config.mk b/mk/config.mk
index c7d952d16..4a650dcd5 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -13,7 +13,7 @@ BOARD?=
 PREFIX_BINARY?=1
 ## Enable to use up-to-date rust compiler (experimental, only available to Tier 2 targets)
 ## Even more experimental, add -Zbuild-std to cookbook.toml to allow compilation to Tier 3 targets
-EXPERIMENTAL_PREFIX_USE_UPSTREAM_RUST_COMPILER?=0
+PREFIX_USE_UPSTREAM_RUST_COMPILER?=0
 ## Enable to use binary packages (much faster)
 REPO_BINARY?=0
 ## Name of the configuration to include in the image name e.g. desktop or server
diff --git a/mk/prefix.mk b/mk/prefix.mk
index b470c7bfc..deb082344 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -325,8 +325,8 @@ $(PREFIX)/gcc-install.tar.gz: $(PREFIX)/gcc-install
 		--directory="$<" \
 		.
 
-# RUST VIA RUSTUP ---------------------------------------------------
-ifeq ($(EXPERIMENTAL_PREFIX_USE_UPSTREAM_RUST_COMPILER),1)
+# RUST FROM UPSTREAM COMPILER ---------------------------------------------------
+ifeq ($(PREFIX_USE_UPSTREAM_RUST_COMPILER),1)
 
 $(PREFIX)/rustc-install.tar.xz:
 	mkdir -p "$(@D)"
@@ -357,10 +357,10 @@ $(PREFIX)/rust-src-install.tar.xz:
 	wget -O $@.partial "https://static.rust-lang.org/dist/$(UPSTREAM_RUSTC_VERSION)/rust-src-nightly.tar.xz"
 	mv $@.partial $@
 
-$(PREFIX)/rust-install: $(PREFIX)/gcc-install.tar.gz $(PREFIX)/rustc-install.tar.xz $(PREFIX)/cargo-install.tar.xz $(PREFIX)/rust-std-host-install.tar.xz $(PREFIX)/rust-std-target-install.tar.xz $(PREFIX)/rust-src-install.tar.xz
+$(PREFIX)/rust-install: $(PREFIX)/gcc-install $(PREFIX)/rustc-install.tar.xz $(PREFIX)/cargo-install.tar.xz $(PREFIX)/rust-std-host-install.tar.xz $(PREFIX)/rust-std-target-install.tar.xz $(PREFIX)/rust-src-install.tar.xz
 	rm -rf "$@.partial" "$@"
 	mkdir -p "$@.partial"
-	tar --extract --file "$(PREFIX)/gcc-install.tar.gz" -C "$@.partial" || true
+	cp -r "$(PREFIX)/gcc-install/". "$@.partial"
 	tar --extract --file "$(PREFIX)/rustc-install.tar.xz" -C "$@.partial" rustc-nightly-$(HOST_TARGET)/rustc/ --strip-components=2
 	tar --extract --file "$(PREFIX)/cargo-install.tar.xz" --directory "$@.partial" cargo-nightly-$(HOST_TARGET)/cargo/ --strip-components=2
 	tar --extract --file "$(PREFIX)/rust-std-host-install.tar.xz" --directory "$@.partial" rust-std-nightly-$(HOST_TARGET)/rust-std-$(HOST_TARGET)/ --strip-components=2