[CRIU] [PATCH 04/11] nmk: Drop unneeded ld_flags

Cyrill Gorcunov gorcunov at gmail.com
Thu Jul 12 15:51:35 MSK 2018


Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
 scripts/nmk/scripts/build.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
index 25c563d25a57..cdbe4c6252b3 100644
--- a/scripts/nmk/scripts/build.mk
+++ b/scripts/nmk/scripts/build.mk
@@ -111,7 +111,7 @@ builtin-name	:= $(strip $(builtin-name))
 
 #
 # Link flags.
-ld_flags	:= $(strip $(LDFLAGS) $(ldflags-y))
+ldflags-y	:= $(strip $(LDFLAGS) $(ldflags-y))
 
 #
 # $(obj) related rules.
@@ -162,7 +162,7 @@ endef
 ifdef builtin-target
         $(eval $(call gen-ld-target-rule,                               \
                         $(builtin-target),                              \
-                        $(ld_flags),                                    \
+                        $(ldflags-y),                                    \
                         $(obj-y) $(__nmk-makefile-deps),                       \
                         $(obj-y) $(call objectify,$(obj-e))))
 endif
@@ -181,7 +181,7 @@ define gen-custom-target-rule
         ifneq ($($(1)-obj-y),)
                 $(eval $(call gen-ld-target-rule,                       \
                                 $(obj)/$(1).built-in.o,                 \
-                                $(ld_flags) $(LDFLAGS_$(1)),            \
+                                $(ldflags-y) $(LDFLAGS_$(1)),            \
                                 $(call objectify,$($(1)-obj-y))         \
                                 $(__nmk-makefile-deps),                        \
                                 $(call objectify,$($(1)-obj-y))         \
-- 
2.14.4



More information about the CRIU mailing list