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 11
11
12
12
jobs :
13
13
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
15
17
name : build-cross-qemu-${{ matrix.config.arch }}
16
18
strategy :
17
19
fail-fast : false
@@ -34,26 +36,17 @@ jobs:
34
36
TRIPLE : ${{ matrix.config.triple }}
35
37
steps :
36
38
- 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 }}
47
40
run : |
48
41
sudo apt update
49
- sudo apt install gcc-$TRIPLE -y
42
+ sudo apt install qemu-user qemu-user-binfmt gcc-$TRIPLE -y
50
43
- name : Build with ${{ matrix.config.triple }}-gcc
51
44
run : make ARCH=$ARCH TOOLPREFIX=$TRIPLE-
52
45
- name : Build tests
53
46
run : make -C test ARCH=$ARCH TOOLPREFIX=$TRIPLE-
54
47
- name : Run Tests
55
48
env :
56
- QEMU_EXEC : qemu-${{ matrix.config.arch }}-static
49
+ QEMU_EXEC : qemu-${{ matrix.config.arch }}
57
50
CROSS_LIB : /usr/${{ matrix.config.triple }}
58
51
run : |
59
52
$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
37
37
USECLANG ?= 1
38
38
endif
39
39
40
+ ifneq (, $(findstring CLANG , $(MSYSTEM )))
41
+ # In MSYS2
42
+ USEGCC = 0
43
+ USECLANG = 1
44
+ endif
45
+
40
46
ifeq ($(ARCH ), wasm32 )
41
47
USECLANG = 1
42
48
USEGCC = 0
You can’t perform that action at this time.
0 commit comments