File tree 2 files changed +3
-7
lines changed
2 files changed +3
-7
lines changed Original file line number Diff line number Diff line change
1
+ #! /bin/sh
2
+ env -u DYLD_LIBRARY_PATH /usr/bin/cc " $@ "
Original file line number Diff line number Diff line change @@ -66,12 +66,8 @@ set_llvm_env() {
66
66
else
67
67
llvm_download $base_url ` llvm_macos_target_triple ${LLVM_VERSION_TRIPLE} `
68
68
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"
71
70
fi
72
- export LD=" ${LLVM_DIRECTORY} /bin/clang"
73
- export CC=" ${LLVM_DIRECTORY} /bin/clang"
74
- export CXX=" ${LLVM_DIRECTORY} /bin/clang++"
75
71
}
76
72
77
73
assert_no_diff () {
@@ -108,8 +104,6 @@ get_cargo_args() {
108
104
109
105
if [ ! -z " $RUST_CROSS_COMPILER " ]; then
110
106
export RUSTFLAGS=" -C linker=${RUST_CROSS_COMPILER} -gcc"
111
- else
112
- export RUSTFLAGS=" -C linker=${LLVM_DIRECTORY} /bin/clang"
113
107
fi
114
108
115
109
CARGO_ARGS=` get_cargo_args`
You can’t perform that action at this time.
0 commit comments