From e81e057b6d70d70616132593dc2acbfe77cb459c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 14 Apr 2010 23:37:47 +1000 Subject: build: try to honor MAKEFLAGS from make This means "make -j" and "make -k" now do roughly what is expected make -j will use the number of CPUs on the system, regardless of the number after the -j (as MAKEFLAGS doesn't contain that value). make -k will will continue on errors --- buildtools/scripts/Makefile.waf | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'buildtools/scripts/Makefile.waf') diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf index a1c4b69525..ac5c01355a 100644 --- a/buildtools/scripts/Makefile.waf +++ b/buildtools/scripts/Makefile.waf @@ -1,11 +1,6 @@ # simple makefile wrapper to run waf -# default to using only 1 cpu, to be friendly to build -# farm machines. I wonder how we get at the -jN option -# from make to pass it to waf? -JOBS=1 - -WAF=JOBS=$(JOBS) BUILDTOOLS/bin/waf +WAF=WAF_MAKE=1 BUILDTOOLS/bin/waf all: $(WAF) build -- cgit