diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-09-23 09:49:52 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-09-23 09:49:52 +0000 |
| commit | cc5c77bb4a7240537ce921d4e7b9199d4e27a184 (patch) | |
| tree | 3b89e251df9c131bce7f6ea29ab41fd6384704e7 | |
| parent | eabd545e36021159089979d028c17fa5771ffdb9 (diff) | |
build: pass MAKE_JOBSERVER via environment to avoid leaking it to error messages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33521 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/toplevel.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk index 5b76a0706..4bbc58e11 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 |