[03/11] nmk: Gather reserved vars on top of build

Submitted by Cyrill Gorcunov on July 12, 2018, 12:51 p.m.

Details

Message ID 20180712125142.8737-4-gorcunov@gmail.com
State Accepted
Series "build: Fix issue on simultaneous build"
Headers show

Commit Message

Cyrill Gorcunov July 12, 2018, 12:51 p.m.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 scripts/nmk/scripts/build.mk | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
index f16af03f2519..25c563d25a57 100644
--- a/scripts/nmk/scripts/build.mk
+++ b/scripts/nmk/scripts/build.mk
@@ -6,17 +6,25 @@  ifndef ____nmk_defined__build
 src		:= $(obj)
 src-makefile	:= $(call objectify,$(makefile))
 obj-y		:=
+obj-e		:=
+builtin-name	:=
+builtin-target	:=
 lib-y		:=
+lib-e		:=
+lib-name	:=
+lib-target	:=
+hostprogs-y	:=
+libso-y		:=
+ld_flags	:=
+ldflags-so	:=
+arflags-y	:=
 target          :=
 deps-y		:=
 all-y		:=
-builtin-name	:=
-lib-name	:=
-ld_flags	:=
 cleanup-y	:=
 mrproper-y	:=
+target		:=
 objdirs		:=
-libso-y	        :=
 
 MAKECMDGOALS := $(call uniq,$(MAKECMDGOALS))
 
@@ -112,7 +120,6 @@  $(eval $(call gen-cc-rules,$(obj)/%,$(obj)/%))
 #
 # Prepare targets.
 ifneq ($(lib-y),)
-        lib-target :=
         ifneq ($(lib-name),)
                 lib-target := $(obj)/$(lib-name)
         else
@@ -125,7 +132,6 @@  ifneq ($(lib-y),)
 endif
 
 ifneq ($(obj-y),)
-        builtin-target :=
         ifneq ($(builtin-name),)
                 builtin-target := $(obj)/$(builtin-name)
         else

Comments

Dmitry Safonov July 18, 2018, 2:46 p.m.
2018-07-12 13:51 GMT+01:00 Cyrill Gorcunov <gorcunov@gmail.com>:
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com>

Thanks,
             Dmitry