From 7950f996e0ab8d5b8c4cb168aaa71a42c9021762 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 23 Sep 2012 09:49:52 +0000 Subject: [PATCH] build: pass MAKE_JOBSERVER via environment to avoid leaking it to error messages SVN-Revision: 33521 --- include/toplevel.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/toplevel.mk b/include/toplevel.mk index 5b76a0706f..4bbc58e11d 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -26,6 +26,7 @@ export IS_TTY=$(shell tty -s && echo 1 || echo 0) export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib) export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib) export GIT_CONFIG_PARAMETERS='core.autocrlf=false' +export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS)) # prevent perforce from messing with the patch utility unexport P4PORT P4USER P4CONFIG P4CLIENT @@ -148,7 +149,7 @@ prereq:: prepare-tmpinfo .config echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!"; \ fi \ ) - @+$(SUBMAKE) -r $@ MAKE_JOBSERVER="$(filter --jobserver%,$(MAKEFLAGS))" + @+$(SUBMAKE) -r $@ help: cat README