From 523ab85264c0895fd62b53a62994bcde34f98a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sat, 27 Apr 2024 00:01:34 +0200
Subject: [PATCH] fixup! fixup! fixup! ci: Try to fix macOS runner

---
 ci/macos-cargo-linker | 2 ++
 ci/test.sh            | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)
 create mode 100755 ci/macos-cargo-linker

diff --git a/ci/macos-cargo-linker b/ci/macos-cargo-linker
new file mode 100755
index 0000000000..6fa2d807ce
--- /dev/null
+++ b/ci/macos-cargo-linker
@@ -0,0 +1,2 @@
+#!/bin/sh
+env -u DYLD_LIBRARY_PATH /usr/bin/cc "$@"
diff --git a/ci/test.sh b/ci/test.sh
index 670845b53f..94cc15eb6a 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -66,12 +66,8 @@ set_llvm_env() {
   else
     llvm_download $base_url `llvm_macos_target_triple ${LLVM_VERSION_TRIPLE}`
     export DYLD_LIBRARY_PATH="${LLVM_DIRECTORY}/lib":${DYLD_LIBRARY_PATH:-}
-    export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="${LLVM_DIRECTORY}/bin/clang"
-    export MACOSX_DEPLOYMENT_TARGET="10.6"
+    export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="$(pwd)/ci/macos-cargo-linker"
   fi
-  export LD="${LLVM_DIRECTORY}/bin/clang"
-  export CC="${LLVM_DIRECTORY}/bin/clang"
-  export CXX="${LLVM_DIRECTORY}/bin/clang++"
 }
 
 assert_no_diff() {
@@ -108,8 +104,6 @@ get_cargo_args() {
 
 if [ ! -z "$RUST_CROSS_COMPILER" ]; then
   export RUSTFLAGS="-C linker=${RUST_CROSS_COMPILER}-gcc"
-else
-  export RUSTFLAGS="-C linker=${LLVM_DIRECTORY}/bin/clang"
 fi
 
 CARGO_ARGS=`get_cargo_args`