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

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Tue, Feb 20, 2018 at 11:29:58AM +0000, Wei Liu wrote:
> On Tue, Feb 20, 2018 at 11:26:44AM +0000, Roger Pau Monné wrote:
> > On Tue, Feb 20, 2018 at 11:17:47AM +0000, Wei Liu wrote:
> > > 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
> > 
> > Is this supported by make 3.80?
> > 
> > Jan pointed out in another thread that using "else if" on a single
> > line is not supported by 3.80:
> > 
> > https://lists.xenproject.org/archives/html/xen-devel/2018-02/msg01659.html
> > 

Actually, see

https://www.cl.cam.ac.uk/teaching/1011/UnixTools/make.pdf


http://www.delorie.com/gnu/docs/make/make_77.html

Make 3.82 manual supports that syntax. But 3.80 doesn't.

Wei.

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