Skip to content

Commit 523ab85

Browse files
committed
fixup! fixup! fixup! ci: Try to fix macOS runner
1 parent 696d5a8 commit 523ab85

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

ci/macos-cargo-linker

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
env -u DYLD_LIBRARY_PATH /usr/bin/cc "$@"

ci/test.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,8 @@ set_llvm_env() {
6666
else
6767
llvm_download $base_url `llvm_macos_target_triple ${LLVM_VERSION_TRIPLE}`
6868
export DYLD_LIBRARY_PATH="${LLVM_DIRECTORY}/lib":${DYLD_LIBRARY_PATH:-}
69-
export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="${LLVM_DIRECTORY}/bin/clang"
70-
export MACOSX_DEPLOYMENT_TARGET="10.6"
69+
export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="$(pwd)/ci/macos-cargo-linker"
7170
fi
72-
export LD="${LLVM_DIRECTORY}/bin/clang"
73-
export CC="${LLVM_DIRECTORY}/bin/clang"
74-
export CXX="${LLVM_DIRECTORY}/bin/clang++"
7571
}
7672

7773
assert_no_diff() {
@@ -108,8 +104,6 @@ get_cargo_args() {
108104

109105
if [ ! -z "$RUST_CROSS_COMPILER" ]; then
110106
export RUSTFLAGS="-C linker=${RUST_CROSS_COMPILER}-gcc"
111-
else
112-
export RUSTFLAGS="-C linker=${LLVM_DIRECTORY}/bin/clang"
113107
fi
114108

115109
CARGO_ARGS=`get_cargo_args`

0 commit comments

Comments
 (0)