From d99f5defa3460f1df92008d45eae8238cd0998db Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 24 Jan 2018 11:56:08 +0000 Subject: [PATCH] build: Fix dependency objects for system libraries The dependency checks for system libraries is not really portable. Not all C standard libraries have separate rt and math libraries, so the requirement should be set to false. Additionally, finding threading libraries should be left to Meson itself, using the `dependency('threads')` object, which will do the right thing depending on platform and compiler. --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 902894f14..aeaa96804 100644 --- a/meson.build +++ b/meson.build @@ -141,10 +141,10 @@ configure_file(input : 'Makefile.in', configuration : makedata) # Find dependencies -mathlib = cc.find_library('m', required : true) -rt_lib = cc.find_library('rt', required : true) # clock_gettime -dl_lib = cc.find_library('dl', required : true) -pthread_lib = cc.find_library('pthread', required : true) +mathlib = cc.find_library('m', required : false) +rt_lib = cc.find_library('rt', required : false) # clock_gettime +dl_lib = cc.find_library('dl', required : false) +pthread_lib = dependency('threads') dbus_dep = dependency('dbus-1') #optional dependencies