From a160034f20dfe82109931168de155950d8cb55f9 Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Sun, 20 Oct 2024 17:45:28 -0700
Subject: [PATCH] cleanup: remove glibc rustlib patch

---
 packages/cross-x86_64-gnu-rust/Containerfile |  6 +-----
 packages/cross-x86_64-gnu-rust/glibc.patch   | 19 -------------------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 packages/cross-x86_64-gnu-rust/glibc.patch

diff --git a/packages/cross-x86_64-gnu-rust/Containerfile b/packages/cross-x86_64-gnu-rust/Containerfile
index 390136d..790961c 100644
--- a/packages/cross-x86_64-gnu-rust/Containerfile
+++ b/packages/cross-x86_64-gnu-rust/Containerfile
@@ -33,7 +33,6 @@ ADD *.patch .
 RUN <<EOF
 	set -eux
 	PREFIX=/rust-${VERSION}/usr
-    patch -p1 ../glibc.patch
 	./configure \
 		--build="x86_64-unknown-linux-musl" \
 		--host="x86_64-unknown-linux-musl" \
@@ -52,8 +51,6 @@ RUN <<EOF
 		--sysconfdir="/rootfs/etc" \
 		--libdir="/opt/cross/lib/x86_64-linux-gnu" \
 	    --set="install.prefix=/rootfs" \
-		--set="rust.musl-root=/usr" \
-		--set="target.x86_64-unknown-linux-gnu.musl-libdir=/opt/cross/lib/x86_64-linux-gnu" \
 		--set="target.x86_64-unknown-linux-gnu.llvm-config=/usr/bin/llvm-config" \
 		--set="target.x86_64-unknown-linux-gnu.cc=x86_64-linux-gnu-gcc" \
 		--set="target.x86_64-unknown-linux-gnu.cxx=x86_64-linux-gnu-c++" \
@@ -67,8 +64,7 @@ RUN <<EOF
 		--set="rust.parallel-compiler=false" \
 		--set="rust.remap-debuginfo=true" \
 		--set="rust.llvm-libunwind=in-tree" \
-		--set="build.full-bootstrap=true" \
-
+		--set="build.full-bootstrap=true"
 	python3 x.py build --stage 0 --target x86_64-unknown-linux-gnu library
 EOF
 
diff --git a/packages/cross-x86_64-gnu-rust/glibc.patch b/packages/cross-x86_64-gnu-rust/glibc.patch
deleted file mode 100644
index 3e1fc25..0000000
--- a/packages/cross-x86_64-gnu-rust/glibc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index df4d1a43dab..17bb8bf9659 100644
---- a/src/bootstrap/src/core/build_steps/compile.rs
-+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -438,12 +438,12 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
- 
-         // Help the libc crate compile by assisting it in finding various
-         // sysroot native libraries.
--        if target.contains("musl") {
-+        //if target.contains("musl") {
-             if let Some(p) = builder.musl_libdir(target) {
-                 let root = format!("native={}", p.to_str().unwrap());
-                 cargo.rustflag("-L").rustflag(&root);
-             }
--        }
-+        //}
- 
-         if target.contains("-wasi") {
-             if let Some(p) = builder.wasi_root(target) {