fix: Fix failed build on gcc-8.3

DLTcollab · Jan 27, 2024 · e7a63fe · e7a63fe
1 parent 01cba29
commit e7a63fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.ci/cross-check.sh b/.ci/cross-check.sh
@@ -11,12 +11,16 @@ 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.03/binrel/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz?revision=e09a1c45-0ed3-4a8e-b06b-db3978fd8d56&rev=e09a1c450ed34a8eb06bdb3978fd8d56&hash=9C4F2E8255CB4D87EABF5769A2E65733"
+
+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
@@ -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.