Skip to content

Commit 61eb11c

Browse files
committed
fixup?
1 parent 9cf3652 commit 61eb11c

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,12 @@ if(BUILD_QJS_LIBC)
130130
list(APPEND qjs_sources quickjs-libc.c)
131131
endif()
132132
list(APPEND qjs_defines _GNU_SOURCE)
133-
list(APPEND qjs_libs qjs m pthread)
134-
if(NOT MINGW)
135-
list(APPEND qjs_libs dl pthread)
133+
list(APPEND qjs_libs qjs m)
134+
if(NOT WIN32)
135+
list(APPEND qjs_libs dl)
136+
endif()
137+
if(NOT MSVC)
138+
list(APPEND qjs_libs pthread)
136139
endif()
137140

138141
add_library(qjs ${qjs_sources})
@@ -200,7 +203,7 @@ add_executable(run-test262
200203
run-test262.c
201204
)
202205
target_compile_definitions(run-test262 PRIVATE ${qjs_defines})
203-
target_link_libraries(run-test262 ${qjs_libs} pthread)
206+
target_link_libraries(run-test262 ${qjs_libs})
204207

205208

206209
# Unicode generator

qjs.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,12 @@ static inline size_t js_trace_malloc_usable_size(void *ptr)
144144
}
145145

146146
static void
147+
#if defined(_WIN32) && !defined(__clang__)
148+
/* mingw printf is used */
149+
__attribute__((format(gnu_printf, 2, 3)))
150+
#else
147151
__attribute__((format(printf, 2, 3)))
152+
#endif
148153
js_trace_malloc_printf(JSMallocState *s, const char *fmt, ...)
149154
{
150155
va_list ap;

0 commit comments

Comments
 (0)