From e16335b905e028769482b87ca2e648107a9e7d9b Mon Sep 17 00:00:00 2001
From: Yang Hau <yuanyanghau@gmail.com>
Date: Sat, 27 Jan 2024 14:55:58 +0800
Subject: [PATCH] fix: Fix failed build on gcc-8.3

---
 .ci/cross-check.sh | 15 +++++++++------
 .ci/cross-tool.sh  |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.ci/cross-check.sh b/.ci/cross-check.sh
index 5efb9fef..50a0ad21 100755
--- a/.ci/cross-check.sh
+++ b/.ci/cross-check.sh
@@ -11,12 +11,15 @@ if [ $(printenv CXX | grep clang) ]; then
     exit
 fi
 
-set -x
+set -e
 
-make clean
-export PATH=gcc-arm-${GCC_REL}-x86_64-aarch64-none-linux-gnu/bin:$PATH
-make CROSS_COMPILE=aarch64-none-linux-gnu- check || exit 1 # ARMv8-A
+wget -O gcc-arm-8.3-2019.02-x86_64-arm-linux-gnueabihf.tar.xz "https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.02/gcc-arm-8.3-2019.02-x86_64-arm-linux-gnueabihf.tar.xz?revision=ac15fd02-ba82-40dd-8b9a-8e5996988618&rev=ac15fd02ba8240dd8b9a8e5996988618&hash=347FC4F06948A4C49D8DFC6D847DC1AA090D3588"
+tar Jxvf gcc-arm-8.3-2019.02-x86_64-arm-linux-gnueabihf.tar.xz
 
 make clean
-export PATH=gcc-arm-${GCC_REL}-x86_64-arm-none-linux-gnueabihf/bin:$PATH
-make CROSS_COMPILE=arm-none-linux-gnueabihf- check || exit 1 # ARMv7-A
+export PATH=gcc-arm-8.3-2019.02-x86_64-arm-linux-gnueabihf/bin:$PATH
+make CROSS_COMPILE=arm-linux-gnueabihf- check || exit 1 # ARMv8-A
+
+# make clean
+# export PATH=gcc-arm-${GCC_REL}-x86_64-arm-none-linux-gnueabihf/bin:$PATH
+# make CROSS_COMPILE=arm-none-linux-gnueabihf- check || exit 1 # ARMv7-A
diff --git a/.ci/cross-tool.sh b/.ci/cross-tool.sh
index a18e448b..684c5ce6 100755
--- a/.ci/cross-tool.sh
+++ b/.ci/cross-tool.sh
@@ -5,7 +5,7 @@
 check_platform
 
 sudo apt-get update -q -y
-sudo apt-get install -q -y qemu-user
+sudo apt-get install -q -y qemu-user wget
 
 # Clang/LLVM is natively a cross-compiler, meaning that one set of programs
 # can compile to all targets by setting the -target option.