File tree Expand file tree Collapse file tree 2 files changed +12
-13
lines changed Expand file tree Collapse file tree 2 files changed +12
-13
lines changed Original file line number Diff line number Diff line change 1111
1212jobs :
1313 build-cross-qemu :
14- runs-on : ubuntu-latest
14+ # TODO: We need Ubuntu 24.04 to use newer version of qemu,
15+ # switch to ubuntu-latest when `ubuntu-latest >= 24.04`
16+ runs-on : ubuntu-24.04
1517 name : build-cross-qemu-${{ matrix.config.arch }}
1618 strategy :
1719 fail-fast : false
@@ -34,26 +36,17 @@ jobs:
3436 TRIPLE : ${{ matrix.config.triple }}
3537 steps :
3638 - uses : actions/checkout@v4
37- - name : Install QEMU
38- # this ensure install latest qemu on ubuntu, apt get version is old
39- env :
40- QEMU_SRC : " http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu"
41- QEMU_VER : " qemu-user-static_7\\ .2+dfsg-.*_amd64.deb$"
42- run : |
43- DEB=`curl -s $QEMU_SRC/ | grep -o -E 'href="([^"#]+)"' | cut -d'"' -f2 | grep $QEMU_VER | tail -1`
44- wget $QEMU_SRC/$DEB
45- sudo dpkg -i $DEB
46- - name : Install toolchain gcc-${{ matrix.config.triple }}
39+ - name : Install qemu and toolchain gcc-${{ matrix.config.triple }}
4740 run : |
4841 sudo apt update
49- sudo apt install gcc-$TRIPLE -y
42+ sudo apt install qemu-user qemu-user-binfmt gcc-$TRIPLE -y
5043 - name : Build with ${{ matrix.config.triple }}-gcc
5144 run : make ARCH=$ARCH TOOLPREFIX=$TRIPLE-
5245 - name : Build tests
5346 run : make -C test ARCH=$ARCH TOOLPREFIX=$TRIPLE-
5447 - name : Run Tests
5548 env :
56- QEMU_EXEC : qemu-${{ matrix.config.arch }}-static
49+ QEMU_EXEC : qemu-${{ matrix.config.arch }}
5750 CROSS_LIB : /usr/${{ matrix.config.triple }}
5851 run : |
5952 $QEMU_EXEC -L . -L $CROSS_LIB/ test/test-float
Original file line number Diff line number Diff line change @@ -37,6 +37,12 @@ USEGCC ?= 0
3737USECLANG ?= 1
3838endif
3939
40+ ifneq (, $(findstring CLANG , $(MSYSTEM )))
41+ # In MSYS2
42+ USEGCC = 0
43+ USECLANG = 1
44+ endif
45+
4046ifeq ($(ARCH ), wasm32 )
4147USECLANG = 1
4248USEGCC = 0
You can’t perform that action at this time.
0 commit comments