Skip to content

Add clang64 MinGW environment to CI #146

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

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Add clang64 MinGW environment to CI #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ jobs:
sys:
- mingw32
- mingw64
- clang64
- ucrt64
defaults:
run:
Expand Down
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,11 @@ if(BUILD_QJS_LIBC)
endif()
list(APPEND qjs_defines _GNU_SOURCE)
list(APPEND qjs_libs qjs m)
if(NOT MINGW)
list(APPEND qjs_libs dl pthread)
if(NOT WIN32)
list(APPEND qjs_libs dl)
endif()
if(NOT MSVC)
list(APPEND qjs_libs pthread)
endif()

add_library(qjs ${qjs_sources})
Expand Down
2 changes: 1 addition & 1 deletion qjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static inline size_t js_trace_malloc_usable_size(void *ptr)
}

static void
#ifdef _WIN32
#if defined(_WIN32) && !defined(__clang__)
/* mingw printf is used */
__attribute__((format(gnu_printf, 2, 3)))
#else
Expand Down