From dd40177c1bc86650a2be9786289ebe0397b1c0a3 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Wed, 15 Aug 2012 09:42:14 +0200 Subject: [PATCH] x86-64/EFI: add CFLAGS to check compile Without this, the compilation of check.c could fail due to compiler features such as -fstack-protector being enabled, which causes a missing __stack_chk_fail symbol error. Signed-off-by: Daniel De Graaf Rather than using plain CFLAGS here, remove CFLAGS-y from them to particularly get rid of the -MF argument referencing (the undefined here) $(@F). The use of CFLAGS at once allows dropping the explicit use of -Werror. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- xen/arch/x86/efi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile index 005e3e05dd..9ce68fb4ed 100644 --- a/xen/arch/x86/efi/Makefile +++ b/xen/arch/x86/efi/Makefile @@ -5,7 +5,7 @@ obj-y += stub.o create = test -e $(1) || touch -t 199901010000 $(1) efi := $(filter y,$(x86_64)$(shell rm -f disabled)) -efi := $(if $(efi),$(shell $(CC) -c -Werror check.c 2>disabled && echo y)) +efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y),$(CFLAGS)) -c check.c 2>disabled && echo y)) efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y)) efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o))) -- 2.30.2