fixup! fixup! fixup! ci: Try to fix macOS runner

rust-lang · Apr 26, 2024 · c8b7673 · c8b7673
1 parent 696d5a8
commit c8b7673
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/ci/macos-cargo-linker 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
@@ -66,8 +66,7 @@ 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"
@@ -108,8 +107,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`