From 17685d0e50651fd95bd221a8660f1ff9a7492d1e Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Tue, 5 Oct 2021 15:51:16 -0500 Subject: waf_libbsd: Account for library check results Conditionally compiled tests (consisting only of debugger01) were not compiling as expected when libdebugger was present. This appears to have occurred during the transition from header detection or due to an intervening change in the waf internal libraries. The result of check_cc() is the only location this information is reported, so library checks now set HAVE_ as appropriate when the library is found so existing code for header configuration correctly recognize that a library is present. --- waf_libbsd.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/waf_libbsd.py b/waf_libbsd.py index 0bd4fd3d..ee0a3878 100644 --- a/waf_libbsd.py +++ b/waf_libbsd.py @@ -180,10 +180,11 @@ class Builder(builder.ModuleManager): mandatory=False) elif configTest == 'library': for l in self.data['configure'][configTest][cfg]: - conf.check_cc(lib=l, - fragment=rtems.test_application(), - execute=False, - mandatory=False) + if conf.check_cc(lib=l, + fragment=rtems.test_application(), + execute=False, + mandatory=False) + conf.env['HAVE_%s' % l.upper()] = True else: bld.fatal('invalid config test: %s' % (configTest)) section_flags = ["-fdata-sections", "-ffunction-sections"] -- cgit v1.2.3