From f54942c62a46ffaa1cee9d634af5a79e29e93ad0 Mon Sep 17 00:00:00 2001 From: Dmitry Safonov Date: Thu, 19 Apr 2018 04:22:55 +0100 Subject: [PATCH] make: Don't set $(MAKEFLAGS) We shouldn't set MAKEFLAGS by the following reasons: 1. User may want to specify some make parameter (e.g., `-d` for debug) 2. We lose parallel build. No `-j` is passed to submake and it looks like, gnu/make will not deal with parallel recursive make if $(MAKEFLAGS) is unset back. Easy to verify: Add `sleep 3` to build rule in Makefile.inc and you'll find only one sleep process at a time. After the patch if you specify say `-j5` to make - you'll have 5 sleep processes. Reverts: commit e9beed7bb3f3 ("build: zdtm -- Add implicit rules into zdtm building"). Cc: Cyrill Gorcunov Signed-off-by: Dmitry Safonov Signed-off-by: Andrei Vagin --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b9cc42286..6522d91df 100644 --- a/Makefile +++ b/Makefile @@ -278,11 +278,11 @@ docs: .PHONY: docs zdtm: all - $(Q) MAKEFLAGS= $(MAKE) -C test/zdtm all + $(Q) $(MAKE) -C test/zdtm all .PHONY: zdtm test: zdtm - $(Q) MAKEFLAGS= $(MAKE) -C test + $(Q) $(MAKE) -C test .PHONY: test #