patchbot at xen
Aug 15, 2012, 2:55 PM
Post #1 of 1
(36 views)
Permalink
|
|
[xen-unstable] x86-64/EFI: add CFLAGS to check compile
|
|
# HG changeset patch
# User Daniel De Graaf <dgdegra [at] tycho>
# Date 1345016534 -7200
# Node ID 02b4d5fedb7bac4f98964d32fd9ed1d17b1db4b1
# Parent af7143d97fa2f9954afca79528e482a192d3edd2
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 [at] tycho>
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 [at] suse>
Committed-by: Jan Beulich <jbeulich [at] suse>
---
diff -r af7143d97fa2 -r 02b4d5fedb7b xen/arch/x86/efi/Makefile
--- a/xen/arch/x86/efi/Makefile Tue Aug 14 15:59:38 2012 +0100
+++ b/xen/arch/x86/efi/Makefile Wed Aug 15 09:42:14 2012 +0200
@@ -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)))
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
