[_]

YaoApp · Sep 21, 2023 · b332929 · b332929
1 parent 6414b2e
commit b332929
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -18,13 +18,20 @@ jobs:
     steps:
       - name: Arm Build
         run: |
+          echo "deb http://mirrors.kernel.org/ubuntu mantic main universe" >> /etc/apt/sources.list
           sudo apt-get update
           sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev build-essential bison flex libssl-dev bc
           sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
           sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
           sudo apt-get install -y g++-aarch64-linux-gnu crossbuild-essential-arm64
           sudo apt-get install -y gcc-12-aarch64-linux-gnu
           sudo apt-get install -y g++-12-aarch64-linux-gnu
+          sudo apt-get install -y gcc-13-aarch64-linux-gnu
+          sudo apt-get install -y g++-13-aarch64-linux-gnu
+
+      - name: Inspect Tools
+        run: |
+          ls -l /usr/lib/gcc-cross/aarch64-linux-gnu/
 
       - name: Install coscmd
         run: sudo pip3 install coscmd

diff --git a/Makefile b/Makefile
@@ -171,7 +171,7 @@ artifacts-linux: clean
 	mkdir -p dist
 	CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=amd64 go build -v -o dist/yao-${VERSION}-dev-linux-amd64
 #	CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ go build -v -o dist/yao-${VERSION}-dev-linux-arm64
-	CGO_ENABLED=1 CGO_LDFLAGS="-static" LD_LIBRARY_PATH=/usr/lib/gcc-cross/aarch64-linux-gnu/12 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc-12 CXX=aarch64-linux-gnu-g++-12 go build -v -o dist/yao-${VERSION}-dev-linux-arm64
+	CGO_ENABLED=1 CGO_LDFLAGS="-static" LD_LIBRARY_PATH=/usr/lib/gcc-cross/aarch64-linux-gnu/13 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc-13 CXX=aarch64-linux-gnu-g++-13 go build -v -o dist/yao-${VERSION}-dev-linux-arm64
 
 	mkdir -p dist/release
 	mv dist/yao-*-* dist/release/