From cda43e2ad4cc7cec0bac796e7947a44cd344d1f7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 31 Mar 2023 15:59:48 +0200 Subject: [PATCH] llvm15: fix build on arm*musl. --- srcpkgs/llvm15/template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template index cf7bde85e40..3f70c7a2098 100644 --- a/srcpkgs/llvm15/template +++ b/srcpkgs/llvm15/template @@ -130,12 +130,6 @@ post_patch() { ;; esac - case "$XBPS_TARGET_MACHINE" in - arm*-musl|i686-musl) # sanitizer code is broken since it duplicates some libc bits - vsed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' \ - ${wrksrc}/compiler-rt/cmake/config-ix.cmake - ;; - esac } pre_configure() { @@ -175,6 +169,14 @@ pre_configure() { cd ../.. fi + # Patch this after we built tblgen. + case "$XBPS_TARGET_MACHINE" in + arm*-musl|i686-musl) # sanitizer code is broken since it duplicates some libc bits + vsed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' \ + ${wrksrc}/compiler-rt/cmake/config-ix.cmake + ;; + esac + case "$XBPS_TARGET_MACHINE" in i686*) _arch="X86";; x86_64*) _arch="X86";;