From 63ef2958fcb64c660b3c194241b8ab5b58427438 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 15 Dec 2023 23:01:09 +0100
Subject: [PATCH] chromium: unbreak aarch64 glibc cross build

---
 srcpkgs/chromium/template | 41 ++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 1c9594bedd8..44cc292c3e0 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -63,17 +63,11 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	case "${XBPS_TARGET_MACHINE}" in
-		aarch64)
-			bro
 		aarch64*) ;;
 		*) nocross="chromium can not be cross compiled for this architecture" ;;
 	esac
 fi
 
-case "${XBPS_TARGET_MACHINE}" in
-	aarch64)
-		broken="https://build.voidlinux.org/builders/aarch64_builder/builds/46556/steps/shell_3/logs/stdio" ;;
-esac
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		for f in "${FILESDIR}"/musl-patches/*.patch; do
@@ -95,8 +89,6 @@ post_patch() {
 }
 
 _setup_clang() {
-	local gcc_version=$(gcc -dumpversion)
-	local clang_version=$(clang -dumpversion)
 	export CC=clang
 	export CXX=clang++
 	export AR=llvm-ar
@@ -110,22 +102,27 @@ _setup_clang() {
 	export BUILD_NM=llvm-nm
 	export BUILD_CFLAGS="-Wno-unknown-warning-option"
 	export BUILD_CXXFLAGS="-Wno-unknown-warning-option"
-	if [[ -n "$CROSS_BUILD" && -z "$build_option_libcxx" ]]; then
-		CFLAGS+=" --gcc-toolchain=/usr"
+	if [[ -n "$CROSS_BUILD" ]]; then
 		CFLAGS+=" --sysroot=${XBPS_CROSS_BASE}"
-		CFLAGS+=" -nostdinc"
-		CFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
-		CFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
-		CXXFLAGS+=" --gcc-toolchain=/usr"
 		CXXFLAGS+=" --sysroot=${XBPS_CROSS_BASE}"
-		CXXFLAGS+=" -nostdinc++"
-		CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}"
-		CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/${XBPS_CROSS_TRIPLET}"
-		CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/backward"
-		CXXFLAGS+=" -nostdinc"
-		CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
-		CXXFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
-		LDFLAGS+=" --gcc-toolchain=/usr --sysroot=${XBPS_CROSS_BASE}"
+		LDFLAGS+=" --sysroot=${XBPS_CROSS_BASE}"
+		if [[ -z "$build_option_libcxx" ]]; then
+			local gcc_version=$(gcc -dumpversion)
+			local clang_version=$(clang -dumpversion)
+			CFLAGS+=" --gcc-toolchain=/usr"
+			CFLAGS+=" -nostdinc"
+			CFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
+			CFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
+			CXXFLAGS+=" --gcc-toolchain=/usr"
+			CXXFLAGS+=" -nostdinc++"
+			CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}"
+			CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/${XBPS_CROSS_TRIPLET}"
+			CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include/c++/${gcc_version%.*}/backward"
+			CXXFLAGS+=" -nostdinc"
+			CXXFLAGS+=" -isystem ${XBPS_CROSS_BASE}/usr/include"
+			CXXFLAGS+=" -isystem /usr/lib/clang/${clang_version}/include"
+			LDFLAGS+=" --gcc-toolchain=/usr"
+		fi
 	fi
 }