Skip to content

Commit 55242c3

Browse files
committed
Reapply "Use libcompiler-rt and remove hack"
This reverts commit 1ae77a5.
1 parent 43eead1 commit 55242c3

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Tools/pixi-packages/build.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,3 @@ touch configure-done
5050

5151
make -j"${CPU_COUNT}" install
5252
ln -sf "${PREFIX}/bin/python3" "${PREFIX}/bin/python"
53-
54-
# https://github.com/prefix-dev/rattler-build/issues/2012
55-
if [[ ${OSTYPE} == "darwin"* ]]; then
56-
cp "${BUILD_PREFIX}/lib/clang/21/lib/darwin/libclang_rt.asan_osx_dynamic.dylib" "${PREFIX}/lib/"
57-
cp "${BUILD_PREFIX}/lib/clang/21/lib/darwin/libclang_rt.tsan_osx_dynamic.dylib" "${PREFIX}/lib/"
58-
fi

Tools/pixi-packages/default/recipe.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ outputs:
7070
- if: c_compiler == "gcc" and "san" in variant
7171
then:
7272
- libsanitizer
73+
- if: c_compiler == "clang" and "san" in variant
74+
then:
75+
- libcompiler-rt
7376

7477
ignore_run_exports:
7578
from_package:

0 commit comments

Comments
 (0)