From 24f1d73079bab2081694a12df06fb11f07c2f674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 18 May 2021 02:28:33 -0300 Subject: [PATCH] llvm12: only disable sanitizer for arm*-musl. The code erroneously disabled sanitizer support for all musl targets. --- srcpkgs/llvm12/template | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template index 7069f5449733..e3fa1a607772 100644 --- a/srcpkgs/llvm12/template +++ b/srcpkgs/llvm12/template @@ -1,7 +1,7 @@ # Template file for 'llvm12' pkgname=llvm12 version=12.0.0 -revision=1 +revision=2 wrksrc="llvm-${version}.src" build_style=cmake configure_args=" @@ -233,19 +233,16 @@ post_patch() { ;; esac - # some sanitizer currently only on x86_64 stuff needs backtrace case "$XBPS_TARGET_MACHINE" in - x86_64-musl) + x86_64-musl) # some sanitizer currently only on x86_64 stuff needs backtrace vsed -i 's,# Set common link flags.,list(APPEND SANITIZER_COMMON_LINK_LIBS execinfo),' \ ${wrksrc}/projects/compiler-rt/CMakeLists.txt ;; + arm*-musl) # sanitizer code is broken on arm*-musl since it duplicates some libc bits + vsed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' \ + ${wrksrc}/projects/compiler-rt/cmake/config-ix.cmake + ;; esac - - # sanitizer code is broken on arm*-musl since it duplicates some libc bits - if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - vsed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' \ - ${wrksrc}/projects/compiler-rt/cmake/config-ix.cmake - fi } pre_configure() {