From 9483e34037463b083d3e7f437eec6f72c8173996 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 2 Jul 2020 23:13:53 +0200 Subject: Fix werror with clang and deprecation warnings on Mac --- wscript | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wscript b/wscript index 766a56a..f3b0361 100644 --- a/wscript +++ b/wscript @@ -74,14 +74,12 @@ def configure(conf): if conf.env.TARGET_PLATFORM == "win32": append_cflags(['-Wno-cast-function-type']) - if conf.env.TARGET_PLATFORM == 'darwin': - append_cflags(['-DGL_SILENCE_DEPRECATION', - '-Wno-deprecated-declarations']) - if Options.options.ultra_strict and 'clang' in conf.env.CC[0]: for var in ['CFLAGS', 'CXXFLAGS']: flags = conf.env[var] - conf.env[var] = [f for f in flags if not f.startswith('-W')] + conf.env[var] = [f for f in flags + if not (f.startswith('-W') and f != '-Werror')] + conf.env.append_value(var, [ '-Weverything', '-Wno-bad-function-cast', @@ -100,6 +98,10 @@ def configure(conf): '-Wno-old-style-cast', ]) + if conf.env.TARGET_PLATFORM == 'darwin': + append_cflags(['-DGL_SILENCE_DEPRECATION', + '-Wno-deprecated-declarations']) + conf.check_cc(lib='m', uselib_store='M', mandatory=False) conf.check_cc(lib='dl', uselib_store='DL', mandatory=False) -- cgit v1.2.1