From a71747c235e1044a6463909a8916a91eaec1b32c Mon Sep 17 00:00:00 2001 From: Joshua Sing Date: Sat, 12 Apr 2025 23:41:15 +1000 Subject: scripts/test: revert to using g++-14 It seems `g++-loongarch64-linux-gnu` does not exist in the Ubuntu universe repositories. It also fails using the ubuntu Docker image locally (with the universe repo added). `g++-14-loongarch-linux-gnu` exists on both Ubuntu 22.04 and 24.04, however ideally we want to use whatever works on the most platforms. --- scripts/test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/test b/scripts/test index e25a57a..473d689 100755 --- a/scripts/test +++ b/scripts/test @@ -133,13 +133,13 @@ elif [ "$ARCH" = "arm32" -o "$ARCH" = "arm64" ]; then file apps/openssl/.libs/openssl elif [ "$ARCH" = "loong64" ]; then - sudo apt install -y qemu-user-static binfmt-support g++-loongarch64-linux-gnu + sudo apt install -y qemu-user-static binfmt-support g++-14-loongarch64-linux-gnu sudo ln -sf /usr/loongarch64-linux-gnu/lib/ld-linux-loongarch-lp64d.so.1 /lib - CC=loongarch64-linux-gnu-gcc - CXX=loongarch64-linux-gnu++ + CC=loongarch64-linux-gnu-gcc-14 + CXX=loongarch64-linux-gnu++-14 AR=loongarch64-linux-gnu-ar - STRIP=loongarch64-linux-gnu-strip + STRIP=loongarch64-linux-gnu-strip-14 RANLIB=loongarch64-linux-gnu-ranlib ./configure --host=loongarch64-linux-gnu -- cgit v1.2.3-55-g6feb