diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-14 23:37:47 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-14 23:37:47 +1000 |
| commit | e81e057b6d70d70616132593dc2acbfe77cb459c (patch) | |
| tree | ee9fd136626400e7c46e15f172fa43a7083faac2 /buildtools/scripts | |
| parent | 74c4c7fe4f8ed9479a126d1217dfcc084ff31791 (diff) | |
| download | samba-e81e057b6d70d70616132593dc2acbfe77cb459c.tar.gz | |
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
Diffstat (limited to 'buildtools/scripts')
| -rw-r--r-- | buildtools/scripts/Makefile.waf | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf index a1c4b695251..ac5c01355a8 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 |