From aac7c2b6373399a657e811b64123b034b3e202e5 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 12:40:36 +0800 Subject: [PATCH 1/3] ci: fix Install QEMU in cross build --- .github/workflows/cross.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index 2834ced1..ad510fd7 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -38,7 +38,7 @@ jobs: # this ensure install latest qemu on ubuntu, apt get version is old env: QEMU_SRC: "http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu" - QEMU_VER: "qemu-user-static_7\\.2+dfsg-.*_amd64.deb$" + QEMU_VER: "qemu-user-static_6\\.2+dfsg-.*_amd64.deb$" run: | DEB=`curl -s $QEMU_SRC/ | grep -o -E 'href="([^"#]+)"' | cut -d'"' -f2 | grep $QEMU_VER | tail -1` wget $QEMU_SRC/$DEB From 3374db7fce1a117dde1d3dc28e5451efafbb1e41 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 12:48:12 +0800 Subject: [PATCH 2/3] ci: use qemu 9 --- .github/workflows/cross.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index ad510fd7..62620618 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -38,7 +38,7 @@ jobs: # this ensure install latest qemu on ubuntu, apt get version is old env: QEMU_SRC: "http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu" - QEMU_VER: "qemu-user-static_6\\.2+dfsg-.*_amd64.deb$" + QEMU_VER: "qemu-user-static_9.*_amd64.deb$" run: | DEB=`curl -s $QEMU_SRC/ | grep -o -E 'href="([^"#]+)"' | cut -d'"' -f2 | grep $QEMU_VER | tail -1` wget $QEMU_SRC/$DEB From 503faa01622f80ccce958fca64d492c30ac1fec3 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sat, 14 Dec 2024 13:22:53 +0800 Subject: [PATCH 3/3] ci: fix clang build --- Make.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Make.inc b/Make.inc index df8fbf05..498e1081 100644 --- a/Make.inc +++ b/Make.inc @@ -37,6 +37,12 @@ USEGCC ?= 0 USECLANG ?= 1 endif +ifneq (,$(findstring CLANG,$(MSYSTEM))) +# In MSYS2 +USEGCC = 0 +USECLANG = 1 +endif + ifeq ($(ARCH),wasm32) USECLANG = 1 USEGCC = 0