diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
index 2834ced1..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_7\\.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
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