Re: [Xen-devel] [PATCH] build: remove shim related targets

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Tue, Feb 20, 2018 at 08:23:51AM +0000, Roger Pau Monne wrote:
> There's no need to have shim specific targets, so just use the regular
> xen makefile targets in order to build the shim binary.
> 
> When the shim is build as part of the firmware directory use the
> xen-syms as the shim binary.
> 
> Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
> index 389096139c..5563c813dd 100644
> --- a/xen/arch/x86/Makefile
> +++ b/xen/arch/x86/Makefile
> @@ -78,12 +78,12 @@ efi-y := $(shell if [ ! -r 
> $(BASEDIR)/include/xen/compile.h -o \
>                        -O $(BASEDIR)/include/xen/compile.h ]; then \
>                           echo '$(TARGET).efi'; fi)
>  
> -shim-$(CONFIG_PVH_GUEST) := $(TARGET)-shim
> -
>  ifneq ($(build_id_linker),)
>  notes_phdrs = --notes
>  else
> -notes_phdrs =
> +ifeq ($(CONFIG_PVH_GUEST),y)
> +notes_phdrs = --notes
> +endif
>  endif
>  

The manual suggests following syntax is supported:


  conditional-directive-one
  text-if-one-is-true
  else conditional-directive-two
  text-if-two-is-true
  else
  text-if-one-and-two-are-false
  endif

I slightly prefer

   ifneq build_id_linker
   notes_phdrs = ...
   else if CONFIG_PVH_GUEST
   notes_phdrs = ...
   else
   notes_phdrs =
   endif

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel