Skip to content

ci: fix clang build #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
inkydragon wants to merge 3 commits into from
Closed

ci: fix clang build #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aac7c2b
ci: fix Install QEMU in cross build
inkydragon Dec 14, 2024
3374db7
ci: use qemu 9
inkydragon Dec 14, 2024
503faa0
ci: fix clang build
inkydragon Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cross.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions Make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading