From f8e0238f0e7c31a1c1a9859e28c6c62910322fed Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Sun, 10 Nov 2024 09:06:34 +0000
Subject: [PATCH] Take advantage of recent cargo -Cmetadata= fix :D.

---
 env/output.mk     |  6 +-----
 env/rustc-wrapper | 26 --------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100755 env/rustc-wrapper

diff --git a/env/output.mk b/env/output.mk
index 42d73b725..7a0ab3ba0 100644
--- a/env/output.mk
+++ b/env/output.mk
@@ -147,7 +147,7 @@ $(output)/%/build.ninja: $$(specific) $$(folder)/meson.build $(output)/$$(arch)/
 
 rust := PATH=$${PATH}:~/.cargo/bin
 
-rustc := 1.77.0
+rustc := 1.82.0
 
 $(output)/rustup-install-%:
 	$(rust) rustup install $*
@@ -157,10 +157,6 @@ $(output)/rustup-target-$(rustc)-%: $(output)/rustup-install-$(rustc)
 	$(rust) rustup target add $* --toolchain $(rustc)
 	@touch $@
 
-ifneq ($(uname-o),Cygwin)
-export RUSTC_WRAPPER=$(CURDIR)/env/rustc-wrapper
-endif
-
 $(output)/%/librust.a: $$(specific) $$(folder)/Cargo.toml $(output)/rustup-target-$(rustc)-$$(triple/$$(arch)) $(sysroot) $$(call head,$$(folder)) $(output)/$$(arch)/usr/bin/pkg-config
 	$(specific)
 	@mkdir -p $(dir $@)
diff --git a/env/rustc-wrapper b/env/rustc-wrapper
deleted file mode 100755
index 187e4733b..000000000
--- a/env/rustc-wrapper
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -e
-
-# XXX: this only exists due to this Cargo bug :(
-# https://github.com/rust-lang/cargo/issues/8140
-
-# XXX: consider just doing something trivial with sed
-#exec $(echo "$*" | sed -e 's/ -C metadata=[^ ]*//g')
-
-file=
-for arg in "$@"; do
-    if [[ ${arg} == ${CARGO_HOME}/* && -z ${file} ]]; then
-        file=${arg##${CARGO_HOME}}
-    fi
-done
-
-args=()
-for arg in "$@"; do
-    if [[ ${arg} == metadata=* ]]; then
-        args+=(metadata="${file}")
-    else
-        args+=("${arg}")
-    fi
-done
-
-exec "${args[@]}"