Commit f5a54e92 ("xen: move some arch CFLAGS into the common
Rules.mk")
transformed CFLAGS assignments to CFLAGS-y ones, which collides with
the was xen/arch/x86/efi/Makefile determines whether the tol chain is
usable for an EFI build. Transform the block back to using CFLAGS.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -41,13 +41,12 @@ ALL_OBJS-y += $(BASEDIR)/x
ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o
-CFLAGS-y += -fno-builtin -fno-common
-CFLAGS-y += -Werror -Wredundant-decls -Wno-pointer-arith
-CFLAGS-y += -pipe
-CFLAGS-y += -g -D__XEN__ -include
$(BASEDIR)/include/xen/config.h
+CFLAGS += -fno-builtin -fno-common
+CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith
+CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h
# Solaris puts stdarg.h &c in the system include directory.
ifneq ($(XEN_OS),SunOS)
-CFLAGS-y += -nostdinc -iwithprefix include
+CFLAGS += -nostdinc -iwithprefix include
endif
CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
At 14:55 +0100 on 26 Aug (1377528920), Jan Beulich wrote:> Commit f5a54e92 ("xen: move some arch CFLAGS into the common Rules.mk") > transformed CFLAGS assignments to CFLAGS-y ones, which collides with > the was xen/arch/x86/efi/Makefile determines whether the tol chain is > usable for an EFI build. Transform the block back to using CFLAGS. > > Signed-off-by: Jan Beulich <jbeulich@suse.com>Eurgh, that difference between CFLAGS and CFLAGS-y should at least be documented somewhere so anyone adding a new flag knows what to do. But this patch looks fine anyway. Reviewed-by: Tim Deegan <tim@xen.org>
On 26/08/2013 14:55, "Jan Beulich" <JBeulich@suse.com> wrote:> Commit f5a54e92 ("xen: move some arch CFLAGS into the common Rules.mk") > transformed CFLAGS assignments to CFLAGS-y ones, which collides with > the was xen/arch/x86/efi/Makefile determines whether the tol chain is > usable for an EFI build. Transform the block back to using CFLAGS. > > Signed-off-by: Jan Beulich <jbeulich@suse.com>Acked-by: Keir Fraser <keir@xen.org>> --- a/xen/Rules.mk > +++ b/xen/Rules.mk > @@ -41,13 +41,12 @@ ALL_OBJS-y += $(BASEDIR)/x > ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o > ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o > > -CFLAGS-y += -fno-builtin -fno-common > -CFLAGS-y += -Werror -Wredundant-decls -Wno-pointer-arith > -CFLAGS-y += -pipe > -CFLAGS-y += -g -D__XEN__ -include > $(BASEDIR)/include/xen/config.h > +CFLAGS += -fno-builtin -fno-common > +CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith > +CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h > # Solaris puts stdarg.h &c in the system include directory. > ifneq ($(XEN_OS),SunOS) > -CFLAGS-y += -nostdinc -iwithprefix include > +CFLAGS += -nostdinc -iwithprefix include > endif > > CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE > > >
On Mon, 2013-09-09 at 04:18 -0700, Keir Fraser wrote:> On 26/08/2013 14:55, "Jan Beulich" <JBeulich@suse.com> wrote: > > > Commit f5a54e92 ("xen: move some arch CFLAGS into the common Rules.mk") > > transformed CFLAGS assignments to CFLAGS-y ones, which collides with > > the was xen/arch/x86/efi/Makefile determines whether the tol chain is > > usable for an EFI build. Transform the block back to using CFLAGS. > > > > Signed-off-by: Jan Beulich <jbeulich@suse.com> > > Acked-by: Keir Fraser <keir@xen.org>I suppose this touches ARM too, in which case: Acked-by: Ian Campbell <ian.campbell@citrix.com> Although +1 to Tim comment about a comment.> > > --- a/xen/Rules.mk > > +++ b/xen/Rules.mk > > @@ -41,13 +41,12 @@ ALL_OBJS-y += $(BASEDIR)/x > > ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o > > ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o > > > > -CFLAGS-y += -fno-builtin -fno-common > > -CFLAGS-y += -Werror -Wredundant-decls -Wno-pointer-arith > > -CFLAGS-y += -pipe > > -CFLAGS-y += -g -D__XEN__ -include > > $(BASEDIR)/include/xen/config.h > > +CFLAGS += -fno-builtin -fno-common > > +CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith > > +CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h > > # Solaris puts stdarg.h &c in the system include directory. > > ifneq ($(XEN_OS),SunOS) > > -CFLAGS-y += -nostdinc -iwithprefix include > > +CFLAGS += -nostdinc -iwithprefix include > > endif > > > > CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE > > > > > > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel