Re: [Qemu-devel] [PATCH] build: simplify Makefile.target around unnest-vars invocations

[Fam Zheng]

On Tue, 04/29 18:46, Paolo Bonzini wrote:
> No need to save/restore obj-y, we can just build all-obj-y incrementally.
> 
> Signed-off-by: Paolo Bonzini <address@hidden>

Reviewed-by: Fam Zheng <address@hidden>

> ---
>  Makefile.target | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/Makefile.target b/Makefile.target
> index 4de6374..67e391d 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -141,10 +141,7 @@ endif # CONFIG_SOFTMMU
>  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
>  
>  dummy := $(call unnest-vars,,obj-y)
> -
> -# we are making another call to unnest-vars with different vars, protect 
> obj-y,
> -# it can be overriden in subdir Makefile.objs
> -obj-y-save := $(obj-y)
> +all-obj-y := $(obj-y)
>  
>  block-obj-y :=
>  common-obj-y :=
> @@ -154,11 +151,7 @@ dummy := $(call unnest-vars,.., \
>                 block-obj-m \
>                 common-obj-y \
>                 common-obj-m)
> -
> -# Now restore obj-y
> -obj-y := $(obj-y-save)
> -
> -all-obj-y = $(obj-y) $(common-obj-y)
> +all-obj-y += $(common-obj-y)
>  all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
>  
>  ifndef CONFIG_HAIKU
> -- 
> 1.8.3.1
> 
>