From c6c79fa1555b6b5b78e8701daa10de672ccc040b Mon Sep 17 00:00:00 2001 From: bill-auger Date: Feb 17 2024 14:05:20 +0000 Subject: iceweasel: tweak for armv7h --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index fe12ca2..2e82e91 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -235,7 +235,7 @@ readonly _SKIP_PGO=$(case "${CARCH}" in armv7h|i686) echo 1 ;; *) echo 0 ;; esac # use GCC vs LLVM # trying one or the other, may resolve sporadic compiler/linker discrepancies -readonly _USE_ALT_COMPILER=$(case "${CARCH}" in armv7h) echo 0 ;; *) echo 0 ;; esac) +readonly _USE_ALT_COMPILER=$(case "${CARCH}" in armv7h) echo 1 ;; *) echo 0 ;; esac) # use 'bfd' linker vs 'lld' # most significantly, this also disables LTO and debugging @@ -735,11 +735,16 @@ build() { export CFLAGS+=' -Wno-unused-command-line-argument' export CXXFLAGS+=' -Wno-unused-command-line-argument' + # FTBS with LLVM: - # warning: obj/dist/system_wrappers/cmath:3:15: fatal error: 'cmath' file not found if ! (( _USE_ALT_COMPILER )) - then export CFLAGS+=" -I/usr/include/c++/12.1.0 -I/usr/include/c++/12.1.0/armv7l-unknown-linux-gnueabihf" + then # warning: obj/dist/system_wrappers/cmath:3:15: fatal error: 'cmath' file not found + export CFLAGS+=" -I/usr/include/c++/12.1.0 -I/usr/include/c++/12.1.0/armv7l-unknown-linux-gnueabihf" export CXXFLAGS+=" -I/usr/include/c++/12.1.0 -I/usr/include/c++/12.1.0/armv7l-unknown-linux-gnueabihf" + + # clang-16: error: unknown argument: '-fvar-tracking-assignments' + export CFLAGS="${CFLAGS/-fvar-tracking-assignments/}" + export CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}" fi ;; i686)