aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Arnold <carnold@suse.com>2012-12-12 11:19:40 +0100
committerCharles Arnold <carnold@suse.com>2012-12-12 11:19:40 +0100
commitab5984c7ace94ebe8d468e4dfe0c882dc6b3dba2 (patch)
tree7ac99885e5a770184a171581de3c2fe363d7ed34
parentbaf237eb06cc10408baf6b5a0c44973bb180e102 (diff)
downloadxen-ab5984c7ace94ebe8d468e4dfe0c882dc6b3dba2.tar.gz
xen-ab5984c7ace94ebe8d468e4dfe0c882dc6b3dba2.tar.bz2
xen-ab5984c7ace94ebe8d468e4dfe0c882dc6b3dba2.zip
x86/EFI: work around CFLAGS being passed in through environment
Short of a solution to the problem described in http://lists.xen.org/archives/html/xen-devel/2012-12/msg00648.html, deal with the bad effect this together with c/s 25751:02b4d5fedb7b has on the EFI build by filtering out the problematic command line items. Signed-off-by: Charles Arnold <carnold@suse.com> Signed-off-by: Jan Beulich <jbeulich@suse.com> xen-unstable changeset: 26272:183fcffb6367 xen-unstable date: Tue Dec 11 12:49:39 UTC 2012
-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 9ce68fb4ed..514dba0871 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) $(filter-out $(CFLAGS-y),$(CFLAGS)) -c check.c 2>disabled && echo y))
+efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(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)))