From 8e8d50e81f60f0f6e3b7f3eeb8ad8ee388777d7b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Sat, 9 Nov 2024 04:00:49 +0100
Subject: [PATCH] config stdc++ for llvm too 3

---
 _build.sh | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/_build.sh b/_build.sh
index 65a30dbe6..4bbae46bb 100755
--- a/_build.sh
+++ b/_build.sh
@@ -1128,32 +1128,6 @@ build_single_target() {
       fi
     fi
 
-    if [ "${_HOST}" = 'linux' ] && [ "${_OS}" = 'linux' ] && [ "${unamem}" != "${_machine}" ] && [ "${_DISTRO}" = 'debian' ]; then
-      # https://packages.debian.org/testing/all/libstdc++-13-dev-arm64-cross/filelist
-      # /usr/aarch64-linux-gnu/include/c++/13/
-      tmp="$(find "/usr/${_TRIPLETSH}/include/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true)"
-      if [ -n "${tmp}" ]; then
-        _CXXFLAGS_GLOBAL+=" -I${tmp}"
-        _CXXFLAGS_GLOBAL+=" -I${tmp}/${_TRIPLETSH}"
-        _CXXFLAGS_GLOBAL+=" -I${tmp}/backward"
-      else
-        # https://packages.debian.org/trixie/arm64/libstdc++-12-dev/filelist
-        # /usr/include/c++/12/algorithm
-        # /usr/include/aarch64-linux-gnu/c++/12/ext/opt_random.h
-        tmp1="$(find "/usr/include/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true)"
-        tmp2="$(find "/usr/include/${_TRIPLETSH}/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true)"
-        if [ -n "${tmp1}" ] && \
-           [ -n "${tmp2}" ]; then
-          _CXXFLAGS_GLOBAL+=" -I${tmp1}"
-          _CXXFLAGS_GLOBAL+=" -I${tmp2}"
-          _CXXFLAGS_GLOBAL+=" -I${tmp1}/backward"
-        else
-          >&2 echo '! Error: Failed to detect g++-cross env root.'
-          exit 1
-        fi
-      fi
-    fi
-
     # TODO: enable it for platform native compiler + mingw-w64 when support reaches them.
     if [ "${_TOOLCHAIN}" = 'llvm-mingw' ]; then
       # Requires llvm v16 and mingw-w64 v11 built with `--enable-cfguard`.
@@ -1244,6 +1218,32 @@ build_single_target() {
     _BINUTILS_SUFFIX="${_CCSUFFIX}"
   fi
 
+  if [ "${_HOST}" = 'linux' ] && [ "${_OS}" = 'linux' ] && [ "${unamem}" != "${_machine}" ] && [ "${_DISTRO}" = 'debian' ]; then
+    # https://packages.debian.org/testing/all/libstdc++-13-dev-arm64-cross/filelist
+    # /usr/aarch64-linux-gnu/include/c++/13/
+    tmp="$(find "/usr/${_TRIPLETSH}/include/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true)"
+    if [ -n "${tmp}" ]; then
+      _CXXFLAGS_GLOBAL+=" -I${tmp}"
+      _CXXFLAGS_GLOBAL+=" -I${tmp}/${_TRIPLETSH}"
+      _CXXFLAGS_GLOBAL+=" -I${tmp}/backward"
+    else
+      # https://packages.debian.org/trixie/arm64/libstdc++-12-dev/filelist
+      # /usr/include/c++/12/algorithm
+      # /usr/include/aarch64-linux-gnu/c++/12/ext/opt_random.h
+      tmp1="$(find "/usr/include/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true)"
+      tmp2="$(find "/usr/include/${_TRIPLETSH}/c++" -mindepth 1 -maxdepth 1 -type d | head -n 1 || true)"
+      if [ -n "${tmp1}" ] && \
+         [ -n "${tmp2}" ]; then
+        _CXXFLAGS_GLOBAL+=" -I${tmp1}"
+        _CXXFLAGS_GLOBAL+=" -I${tmp2}"
+        _CXXFLAGS_GLOBAL+=" -I${tmp1}/backward"
+      else
+        >&2 echo '! Error: Failed to detect g++-cross env root.'
+        exit 1
+      fi
+    fi
+  fi
+
   # Avoid picking up dependencies from system locations
   export PKG_CONFIG_LIBDIR=