Fix build of mingw-w64-clang-aarch64-libc++

* Remove problematic flag from clang environment * Rebuild crt, headers and compiler-rt with the new llvm/lld/clang version and flags (probably not necessary) * Avoid build errors caused by inclusion of headers from existing mingw-w64-clang-aarch64-libc++ package
Martchus · Jan 14, 2025 · 35f8f79 · 35f8f79
1 parent 0684e93
commit 35f8f79
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/compiler-rt/mingw-w64-clang-aarch64/PKGBUILD b/compiler-rt/mingw-w64-clang-aarch64/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mingw-w64-clang-aarch64-compiler-rt
 pkgver=19.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Compiler runtime libraries for clang (mingw-w64)"
 arch=('any')
 url="https://compiler-rt.llvm.org/"

diff --git a/crt/mingw-w64/PKGBUILD b/crt/mingw-w64/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mingw-w64-crt
 pkgver=12.0.0
-pkgrel=1
+pkgrel=4
 pkgdesc='MinGW-w64 CRT for Windows'
 arch=('any')
 url='https://www.mingw-w64.org'

diff --git a/environment/mingw-w64-clang/PKGBUILD b/environment/mingw-w64-clang/PKGBUILD
@@ -1,13 +1,13 @@
 pkgname=mingw-w64-clang-environment
 pkgver=1
-pkgrel=5
+pkgrel=6
 arch=('any')
 pkgdesc="Script providing common environment variables and functions for targeting MinGW with Clang (mingw-w64)"
 license=('GPL-2-or-later')
 depends=('llvm' 'clang' 'lld')
 url='https://github.com/Martchus/PKGBUILDs'
 source=("mingw-env.sh" "lld.sh" "clang.sh" "clang++.sh" "windres.sh" "strip.sh")
-sha256sums=('c3be528af25478987827c18238191c5606da9b960ed32ff0a4eda3769c25b7f3'
+sha256sums=('7740f565de656b46fda9e96649e834384ff6cffe84042ff9b4f6dc07d444cd5e'
             'db37ead09607a88a5b215687e106e6794fa1d0b4c9f50bfe4891b9b3840f1a0a'
             '5722f79c9de1cb9ecac902b2d688f5a27398d5f1dacef9379f59aecc338a3d9d'
             'b20f256f48d36e6f20b52d4835cccecc3a1aa1d46e9febdbd10043a6e197af2c'

diff --git a/environment/mingw-w64-clang/mingw-env.sh b/environment/mingw-w64-clang/mingw-env.sh
@@ -7,7 +7,7 @@ _arch_=${_target%%-*}
   compiler_prefix=mingw- || \
   cross_clang_flags="-rtlib=compiler-rt -fuse-ld=lld -mguard=cf -target $_target -Xclang -triple -Xclang $_target"
 default_mingw_pp_flags="-D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS"
-default_mingw_compiler_flags="$cross_clang_flags $default_mingw_pp_flags -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4 -Wformat -Werror=format-security -mguard=cf"
+default_mingw_compiler_flags="$cross_clang_flags $default_mingw_pp_flags -O2 -pipe -fexceptions --param=ssp-buffer-size=4 -Wformat -Werror=format-security -mguard=cf"
 default_mingw_cxx_compiler_flags="$default_mingw_compiler_flags -stdlib=libc++ -isystem/usr/$_target/include/c++/v1 -isystem/usr/$_target/include"
 default_mingw_linker_flags="$cross_clang_flags -Wl,-O1,--sort-common,--as-needed -fstack-protector"
 [[ $_arch_ == aarch64 ]] || [[ $_arch_ =~ arm.* ]] || default_mingw_compiler_flags+=" -fcf-protection"

diff --git a/headers/mingw-w64/PKGBUILD b/headers/mingw-w64/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mingw-w64-headers
 pkgver=12.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="MinGW-w64 headers for Windows"
 arch=('any')
 url="https://www.mingw-w64.org"

diff --git a/libc++/mingw-w64-clang-aarch64/PKGBUILD b/libc++/mingw-w64-clang-aarch64/PKGBUILD
@@ -27,10 +27,15 @@ build() {
 
   source mingw-clang-env $_target
 
+  # avoid build errors caused by inclusion of headers from existing mingw-w64-clang-aarch64-libc++ package
+  # note: mingw-w64-clang-aarch64-cmake pulls the existing package into the build env.
+  export CXXFLAGS=${CXXFLAGS/-isystem\/usr\/aarch64-w64-mingw32\/include\/c++\/v1/}
+
   $_target-cmake \
     -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_CXX_COMPILER_WORKS=1 \
+    -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
     -DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx" \
     -DLIBUNWIND_USE_COMPILER_RT=ON \
     -DLIBUNWIND_ENABLE_SHARED=ON \