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

Dmitry Safonov 0x7f454c46 at gmail.com
Wed Jul 18 18:14:28 MSK 2018


2018-07-12 13:51 GMT+01:00 Cyrill Gorcunov <gorcunov at gmail.com>:
> 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))         \
> --

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

Thanks,
             Dmitry


More information about the CRIU mailing list