From 6ad580d8685190585ba27e996be7e1a730d2a317 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 9 Sep 2013 14:35:29 +0200 Subject: EFI: fix tool chain capabilities detection 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 Reviewed-by: Tim Deegan Acked-by: Keir Fraser --- xen/Rules.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xen/Rules.mk') diff --git a/xen/Rules.mk b/xen/Rules.mk index bbfc1acc3c..736882a8e1 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -41,13 +41,12 @@ ALL_OBJS-y += $(BASEDIR)/xsm/built_in.o 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 -- cgit v1.2.3