| Message ID | 20200121135916.1140483-3-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen: Build system improvements | expand |
On 21.01.2020 14:59, Anthony PERARD wrote: > The XEN_BUILD_EFI tests in arch/x86/Makefile was filtering out > CFLAGS-y, but according to dd40177c1bc8 ("x86-64/EFI: add CFLAGS to > check compile"), it was done to filter out -MF. XEN_CFLAGS doesn't > have those flags anymore, so no filtering is needed. But this should then be part of patch 10, not 12, I would think. Jan
On Thu, Jan 30, 2020 at 02:32:13PM +0100, Jan Beulich wrote: > On 21.01.2020 14:59, Anthony PERARD wrote: > > The XEN_BUILD_EFI tests in arch/x86/Makefile was filtering out > > CFLAGS-y, but according to dd40177c1bc8 ("x86-64/EFI: add CFLAGS to > > check compile"), it was done to filter out -MF. XEN_CFLAGS doesn't > > have those flags anymore, so no filtering is needed. > > But this should then be part of patch 10, not 12, I would think. Sound good, I'll check if that's fine. Thanks,
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 1e013ee31131..3f7702f42a9d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -171,7 +171,7 @@ EFI_LDFLAGS += --major-os-version=2 --minor-os-version=0 EFI_LDFLAGS += --major-subsystem-version=2 --minor-subsystem-version=0 # Check if the compiler supports the MS ABI. -export XEN_BUILD_EFI := $(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) +export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) # Check if the linker supports PE. XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) asflags-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
The XEN_BUILD_EFI tests in arch/x86/Makefile was filtering out CFLAGS-y, but according to dd40177c1bc8 ("x86-64/EFI: add CFLAGS to check compile"), it was done to filter out -MF. XEN_CFLAGS doesn't have those flags anymore, so no filtering is needed. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- xen/arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)