summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-03-15 13:56:46 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-15 13:56:46 +1100
commit1404a9fe72b2eeb116cfff778408f1671a8a4512 (patch)
treea0f6f9a1c0c9a2f4037c7780b86f029e3ca26e87 /buildtools
parent500c854f792f4a72ef9ac1d100608d5cdc45e7fc (diff)
downloadsamba-1404a9fe72b2eeb116cfff778408f1671a8a4512.tar.gz
samba-1404a9fe72b2eeb116cfff778408f1671a8a4512.tar.bz2
samba-1404a9fe72b2eeb116cfff778408f1671a8a4512.zip
waf: ensure that MAKEFLAGS is set before parsing it
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index bffe98dcd8..3adf533b0e 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -473,6 +473,8 @@ def CHECK_MAKEFLAGS(bld):
if not 'WAF_MAKE' in os.environ:
return
makeflags = os.environ.get('MAKEFLAGS')
+ if makeflags is None:
+ return
jobs_set = False
# we need to use shlex.split to cope with the escaping of spaces
# in makeflags