From 8ceccbf80dea7ac34cda68ec3117d80dd8922159 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 13 Nov 2017 10:13:39 +0000 Subject: [PATCH] meson: Don't define HAVE_PTHREAD only on linux I'm not sure of the reason for this. I don't see anything like this in configure.ac In include/c11/threads.h the cases are: 1) building for Windows -> threads_win32.h 2) HAVE_PTHREAD -> threads_posix.h 3) Not supported on this platform So not defining HAVE_PTHREAD for anything not Windows just means we can't build at all. When we are building for Windows, I'm not sure if dependency('threads') would ever find anything, or defining HAVE_PTHREAD has any effect, but avoid defining it there, just in case. Signed-off-by: Jon Turney Reviewed-by: Eric Engestrom Reviewed-by: Dylan Baker --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 7fdc3c2..383ebb3 100644 --- a/meson.build +++ b/meson.build @@ -668,7 +668,7 @@ endif # TODO: some of these may be conditional dep_zlib = dependency('zlib', version : '>= 1.2.3') dep_thread = dependency('threads') -if dep_thread.found() and host_machine.system() == 'linux' +if dep_thread.found() and host_machine.system() != 'windows' pre_args += '-DHAVE_PTHREAD' endif dep_elf = dependency('libelf', required : false) -- 2.7.4