From a4df7cb1c302017ba131384fc09246315f8b60de Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 7 Jul 2020 22:07:00 +0200 Subject: Fix language checks to actually fail, and support optional languages --- extras/autowaf.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/extras/autowaf.py b/extras/autowaf.py index b9d10f2..3ec4437 100644 --- a/extras/autowaf.py +++ b/extras/autowaf.py @@ -601,16 +601,21 @@ def display_summary(conf, msgs=None): display_msgs(conf, msgs) -def set_c_lang(conf, lang): +def set_c_lang(conf, lang, **kwargs): "Set a specific C language standard, like 'c99' or 'c11'" if conf.env.MSVC_COMPILER: # MSVC has no hope or desire to compile C99, just compile as C++ conf.env.append_unique('CFLAGS', ['/TP']) + return True else: flag = '-std=%s' % lang - conf.check(cflags=['-Werror', flag], - msg="Checking for flag '%s'" % flag) - conf.env.append_unique('CFLAGS', [flag]) + if conf.check(features='c cprogram', + cflags=['-Werror', flag], + msg="Checking for flag '%s'" % flag, + **kwargs): + conf.env.append_unique('CFLAGS', [flag]) + return True + return False def set_cxx_lang(conf, lang): -- cgit v1.2.1