From 5d37f0ea660c6db37ac6fb670ba6b2c384107e4c Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Tue, 26 Apr 2016 14:31:38 +1000 Subject: waf: Check for no FreeBSD options being supplied. --- libbsd_waf.py | 5 +++-- waf_generator.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libbsd_waf.py b/libbsd_waf.py index 689a72c3..c99ef935 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -41,8 +41,9 @@ def build(bld): # Defines defines = [] - for o in bld.env.FREEBSD_OPTIONS.split(","): - defines += ["%s=1" % (o.strip().upper())] + if len(bld.env.FREEBSD_OPTIONS) > 0: + for o in bld.env.FREEBSD_OPTIONS.split(","): + defines += ["%s=1" % (o.strip().upper())] # Include paths includes = [] diff --git a/waf_generator.py b/waf_generator.py index 9d5939a8..ed00e98d 100755 --- a/waf_generator.py +++ b/waf_generator.py @@ -296,8 +296,9 @@ class ModuleManager(builder.ModuleManager): self.add('') self.add(' # Defines') self.add(' defines = []') - self.add(' for o in bld.env.FREEBSD_OPTIONS.split(","):') - self.add(' defines += ["%s=1" % (o.strip().upper())]') + self.add(' if len(bld.env.FREEBSD_OPTIONS) > 0:') + self.add(' for o in bld.env.FREEBSD_OPTIONS.split(","):') + self.add(' defines += ["%s=1" % (o.strip().upper())]') self.add('') self.add(' # Include paths') self.add(' includes = []') -- cgit v1.2.3