diff options
author | Thomas Nagy <tnagy2pow10@gmail.com> | 2015-02-27 11:14:39 +0100 |
---|---|---|
committer | Amar Takhar <amar@rtems.org> | 2015-12-11 15:15:46 -0500 |
commit | b728ff3dc9df52e2647089cc3d3d3993606053df (patch) | |
tree | fdcee5e0fc271cc69f0ec61ff46ae19687c1b273 | |
parent | b8937b2dace44e0450521fa2dc21c6d27d2e354c (diff) |
Disable execution in conf.check_define (cannot run sparc binaries on freebsd for example)
-rw-r--r-- | rtems_waf/config/base.py | 2 | ||||
-rw-r--r-- | rtems_waf/waf.py | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/rtems_waf/config/base.py b/rtems_waf/config/base.py index 424090356a..e789a1e022 100644 --- a/rtems_waf/config/base.py +++ b/rtems_waf/config/base.py @@ -1,6 +1,6 @@ try: from configparser import ConfigParser, NoOptionError -except: +except ImportError: from ConfigParser import ConfigParser, NoOptionError from os.path import exists diff --git a/rtems_waf/waf.py b/rtems_waf/waf.py index a116eb6fe5..f4c8e14610 100644 --- a/rtems_waf/waf.py +++ b/rtems_waf/waf.py @@ -167,16 +167,13 @@ def check_size(ctx, field, mandatory=False, define_name=None): msg = "Checking size of %s" % field ) - -# XXX: It prints "yes" even if it doesn't exist. @conf def check_define(ctx, define, header, mandatory=False): ctx.check( mandatory = mandatory, - fragment = '''#include <%s>\n int main () {\n #ifdef %s\n return 0;\n #endif\n return 1; }\n''' % (header, define), + fragment = '''#include <%s>\n int main () {\n #ifndef %s\n #error "missing define"\n #endif\n return 0; }\n''' % (header, define), define_name = "HAVE_%s" % define.upper(), - features = "c cprogram", - execute = True, + features = "c", msg = "Checking for define %s in %s" % (define, header) ) |