From d3b4fbc2ac8f7f01be6f90c22a55d8820fcce5cc Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 12 Jul 2018 15:51:34 +0300
Subject: [PATCH] nmk: Gather reserved vars on top of build

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 scripts/nmk/scripts/build.mk | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
index f16af03f2..25c563d25 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