@@ -32,12 +32,19 @@ coverage:
3232 LLVM_SYSROOT=" $(rustc --print sysroot)" \
3333 LLVM_HOST=" $(rustc -Vv | awk '/host/ {print $2}')" \
3434 LLVM_BREW=" $(brew --prefix llvm 2>/dev/null || true)" \
35+ LLVM_BREW_VERSIONED=" $(brew --prefix llvm@21 2>/dev/null || true)" \
3536 LLVM_COV=" $(command -v llvm-cov || true)" \
36- LLVM_PROFDATA=" $(command -v llvm-profdata || true)" \
37- LLVM_COV=" ${LLVM_COV:-$LLVM_BREW/bin/llvm-cov}" \
38- LLVM_PROFDATA=" ${LLVM_PROFDATA:-$LLVM_BREW/bin/llvm-profdata}" \
39- LLVM_COV=" ${LLVM_COV:-$LLVM_SYSROOT/lib/rustlib/$LLVM_HOST/bin/llvm-cov}" \
40- LLVM_PROFDATA=" ${LLVM_PROFDATA:-$LLVM_SYSROOT/lib/rustlib/$LLVM_HOST/bin/llvm-profdata}" \
37+ LLVM_PROFDATA=" $(command -v llvm-profdata || true)" ; \
38+ if [ -z " $LLVM_COV" ]; then \
39+ if [ -x " $LLVM_BREW/bin/llvm-cov" ]; then LLVM_COV=" $LLVM_BREW/bin/llvm-cov" ; \
40+ elif [ -x " $LLVM_BREW_VERSIONED/bin/llvm-cov" ]; then LLVM_COV=" $LLVM_BREW_VERSIONED/bin/llvm-cov" ; \
41+ else LLVM_COV=" $LLVM_SYSROOT/lib/rustlib/$LLVM_HOST/bin/llvm-cov" ; fi; \
42+ fi; \
43+ if [ -z " $LLVM_PROFDATA" ]; then \
44+ if [ -x " $LLVM_BREW/bin/llvm-profdata" ]; then LLVM_PROFDATA=" $LLVM_BREW/bin/llvm-profdata" ; \
45+ elif [ -x " $LLVM_BREW_VERSIONED/bin/llvm-profdata" ]; then LLVM_PROFDATA=" $LLVM_BREW_VERSIONED/bin/llvm-profdata" ; \
46+ else LLVM_PROFDATA=" $LLVM_SYSROOT/lib/rustlib/$LLVM_HOST/bin/llvm-profdata" ; fi; \
47+ fi; \
4148 SHADI_KEYCHAIN_TESTS=1 \
4249 PYO3_PYTHON=" {{ python312 }} " RUSTFLAGS=" -C link-arg=-L{{ python_prefix}} /Frameworks/Python.framework/Versions/3.12/lib/python3.12/config-3.12-darwin -C link-arg=-lpython3.12 -C link-arg=-framework -C link-arg=CoreFoundation" \
4350 LLVM_COV=" $LLVM_COV" LLVM_PROFDATA=" $LLVM_PROFDATA" \
@@ -48,12 +55,19 @@ coverage-html:
4855 LLVM_SYSROOT=" $(rustc --print sysroot)" \
4956 LLVM_HOST=" $(rustc -Vv | awk '/host/ {print $2}')" \
5057 LLVM_BREW=" $(brew --prefix llvm 2>/dev/null || true)" \
58+ LLVM_BREW_VERSIONED=" $(brew --prefix llvm@21 2>/dev/null || true)" \
5159 LLVM_COV=" $(command -v llvm-cov || true)" \
52- LLVM_PROFDATA=" $(command -v llvm-profdata || true)" \
53- LLVM_COV=" ${LLVM_COV:-$LLVM_BREW/bin/llvm-cov}" \
54- LLVM_PROFDATA=" ${LLVM_PROFDATA:-$LLVM_BREW/bin/llvm-profdata}" \
55- LLVM_COV=" ${LLVM_COV:-$LLVM_SYSROOT/lib/rustlib/$LLVM_HOST/bin/llvm-cov}" \
56- LLVM_PROFDATA=" ${LLVM_PROFDATA:-$LLVM_SYSROOT/lib/rustlib/$LLVM_HOST/bin/llvm-profdata}" \
60+ LLVM_PROFDATA=" $(command -v llvm-profdata || true)" ; \
61+ if [ -z " $LLVM_COV" ]; then \
62+ if [ -x " $LLVM_BREW/bin/llvm-cov" ]; then LLVM_COV=" $LLVM_BREW/bin/llvm-cov" ; \
63+ elif [ -x " $LLVM_BREW_VERSIONED/bin/llvm-cov" ]; then LLVM_COV=" $LLVM_BREW_VERSIONED/bin/llvm-cov" ; \
64+ else LLVM_COV=" $LLVM_SYSROOT/lib/rustlib/$LLVM_HOST/bin/llvm-cov" ; fi; \
65+ fi; \
66+ if [ -z " $LLVM_PROFDATA" ]; then \
67+ if [ -x " $LLVM_BREW/bin/llvm-profdata" ]; then LLVM_PROFDATA=" $LLVM_BREW/bin/llvm-profdata" ; \
68+ elif [ -x " $LLVM_BREW_VERSIONED/bin/llvm-profdata" ]; then LLVM_PROFDATA=" $LLVM_BREW_VERSIONED/bin/llvm-profdata" ; \
69+ else LLVM_PROFDATA=" $LLVM_SYSROOT/lib/rustlib/$LLVM_HOST/bin/llvm-profdata" ; fi; \
70+ fi; \
5771 SHADI_KEYCHAIN_TESTS=1 \
5872 PYO3_PYTHON=" {{ python312 }} " RUSTFLAGS=" -C link-arg=-L{{ python_prefix}} /Frameworks/Python.framework/Versions/3.12/lib/python3.12/config-3.12-darwin -C link-arg=-lpython3.12 -C link-arg=-framework -C link-arg=CoreFoundation" \
5973 LLVM_COV=" $LLVM_COV" LLVM_PROFDATA=" $LLVM_PROFDATA" \
0 commit comments