From 8baf9f0ed7552f98fc0aeaa545dffb818031f70a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 26 Dec 2017 11:00:45 -0500 Subject: Factor out get_check_func --- autowaf.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/autowaf.py b/autowaf.py index 64aa435..838fcc1 100644 --- a/autowaf.py +++ b/autowaf.py @@ -93,23 +93,21 @@ def set_options(opt, debug_by_default=False, test=False): g_step = 1 -def check_header(conf, lang, name, define='', mandatory=True): - "Check for a header" - includes = '' # search default system include paths - if sys.platform == "darwin": - includes = '/opt/local/include' - +def get_check_func(conf, lang): if lang == 'c': - check_func = conf.check_cc + return conf.check_cc elif lang == 'cxx': - check_func = conf.check_cxx + return conf.check_cxx else: Logs.error("Unknown header language `%s'" % lang) - return +def check_header(conf, lang, name, define='', mandatory=True): + "Check for a header" + check_func = get_check_func(conf, lang) if define != '': - check_func(header_name=name, includes=includes, - define_name=define, mandatory=mandatory) + check_func(header_name=name, + define_name=define, + mandatory=mandatory) else: check_func(header_name=name, includes=includes, mandatory=mandatory) -- cgit v1.2.1