From b11968a1f3ad77cb145a0703c2809a743a898a7d Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Tue, 14 Apr 2026 19:56:28 +0700
Subject: [PATCH] Use real relibc

---
 Cargo.lock                               |  2 +-
 mk/config.mk                             |  2 +-
 recipes/dev/rust/config-cross-linux.toml | 10 +---------
 recipes/libs/libstdcxx-v3/recipe.toml    |  5 ++++-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 644c93b9b..e63cb18eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -918,7 +918,7 @@ dependencies = [
 [[package]]
 name = "redoxer"
 version = "0.2.63"
-source = "git+https://gitlab.redox-os.org/willnode/redoxer.git?branch=linux#c566c012cf073a990bdb2a89bdfe181af808aea6"
+source = "git+https://gitlab.redox-os.org/willnode/redoxer.git?branch=linux#908336f2bf893d026e391b8972f271a78e4e27c2"
 dependencies = [
  "anyhow",
  "dirs",
diff --git a/mk/config.mk b/mk/config.mk
index 81a212425..ef0be1be2 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -161,7 +161,7 @@ endif
 
 ## Userspace variables
 ifeq ($(OPERATING_SYSTEM),linux)
-	export TARGET=$(ARCH)-unknown-linux-musl
+	export TARGET=$(ARCH)-unknown-linux-relibc
 	export GNU_TARGET=$(ARCH)-linux-relibc
 	export USE_RUST_LIBM=1
 else ifeq ($(ARCH),riscv64gc)
diff --git a/recipes/dev/rust/config-cross-linux.toml b/recipes/dev/rust/config-cross-linux.toml
index c2d4ea1d9..efb2a27aa 100644
--- a/recipes/dev/rust/config-cross-linux.toml
+++ b/recipes/dev/rust/config-cross-linux.toml
@@ -5,7 +5,7 @@ link-shared = true
 
 [build]
 host = ["TARGET"]
-target = ["TARGET", "COOKBOOK_TARGET"]
+target = ["TARGET", "x86_64-unknown-linux-relibc", "aarch64-unknown-linux-relibc"]
 cargo-native-static = true
 submodules = false
 docs = false
@@ -21,14 +21,6 @@ sysconfdir = "etc"
 backtrace = false
 codegen-tests = false
 
-[target.COOKBOOK_TARGET]
-cc = "COOKBOOK_GNU_TARGET-gcc"
-cxx = "COOKBOOK_GNU_TARGET-g++"
-ar = "COOKBOOK_GNU_TARGET-ar"
-linker = "COOKBOOK_GNU_TARGET-gcc"
-crt-static = false
-llvm-config = "COOKBOOK_SYSROOT/bin/llvm-config"
-
 [target.aarch64-unknown-linux-gnu]
 llvm-config = "COOKBOOK_TOOLCHAIN/bin/llvm-config"
 
diff --git a/recipes/libs/libstdcxx-v3/recipe.toml b/recipes/libs/libstdcxx-v3/recipe.toml
index be1f84888..c53005dc7 100644
--- a/recipes/libs/libstdcxx-v3/recipe.toml
+++ b/recipes/libs/libstdcxx-v3/recipe.toml
@@ -15,7 +15,10 @@ COOKBOOK_CONFIGURE_FLAGS+=(
 if [ "${TARGET}" = "riscv64gc-unknown-redox" ]; then
 COOKBOOK_CONFIGURE_FLAGS+=( --without-libstdcxx-zoneinfo )
 fi
-if [ "${TARGET}" = "x86_64-unknown-linux-musl" ]; then
+if [ "${TARGET}" = "x86_64-unknown-linux-relibc" ]; then
+COOKBOOK_CONFIGURE_FLAGS+=( --without-libstdcxx-zoneinfo )
+fi
+if [ "${TARGET}" = "aarch64-unknown-linux-relibc" ]; then
 COOKBOOK_CONFIGURE_FLAGS+=( --without-libstdcxx-zoneinfo )
 fi