[04/11] nmk: Drop unneeded ld_flags

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

Details

Message ID 20180712125142.8737-5-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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

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))         \

Comments

Dmitry Safonov July 18, 2018, 3:14 p.m.
2018-07-12 13:51 GMT+01:00 Cyrill Gorcunov <gorcunov@gmail.com>:
> Signed-off-by: Cyrill Gorcunov <gorcunov@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))         \
> --

Worth to remove it from here too, than?
: hostprogs-y     :=
: libso-y         :=
: ld_flags        :=
: ldflags-so      :=
: arflags-y       :=

Thanks,
             Dmitry
Cyrill Gorcunov July 18, 2018, 3:24 p.m.
On Wed, Jul 18, 2018 at 04:14:28PM +0100, Dmitry Safonov wrote:
> 
> Worth to remove it from here too, than?
> : hostprogs-y     :=
> : libso-y         :=
> : ld_flags        :=
> : ldflags-so      :=
> : arflags-y       :=

Yup, missed.