aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/efi
diff options
context:
space:
mode:
authorDaniel De Graaf <dgdegra@tycho.nsa.gov>2012-08-15 09:42:14 +0200
committerDaniel De Graaf <dgdegra@tycho.nsa.gov>2012-08-15 09:42:14 +0200
commitdd40177c1bc86650a2be9786289ebe0397b1c0a3 (patch)
treee232b3b6e1296e26244026ee64990a8397c952f1 /xen/arch/x86/efi
parent040c473d1925e5f471f8aa1b335465816274d3e2 (diff)
downloadxen-dd40177c1bc86650a2be9786289ebe0397b1c0a3.tar.gz
xen-dd40177c1bc86650a2be9786289ebe0397b1c0a3.tar.bz2
xen-dd40177c1bc86650a2be9786289ebe0397b1c0a3.zip
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 <dgdegra@tycho.nsa.gov> 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 <jbeulich@suse.com> Committed-by: Jan Beulich <jbeulich@suse.com>
Diffstat (limited to 'xen/arch/x86/efi')
-rw-r--r--xen/arch/x86/efi/Makefile2
1 files changed, 1 insertions, 1 deletions
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)))