From: Charles Arnold Date: Tue, 11 Dec 2012 12:49:39 +0000 (+0100) Subject: x86/EFI: work around CFLAGS being passed in through environment X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7532 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c1510eb871a5c7f6e4cf29b50f8365408131869b;p=xen.git 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 Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- 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)))