From 9c635883ded517e8d300f36b8e1b31a636278769 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Tue, 18 Oct 2016 12:32:50 +0100 Subject: [PATCH] ARM64: fix libxl build, do not include ../../xen/include Do not include ../../xen/include/ to build libxl_arm_acpi.c: header files clashing against default headers under /usr/include are present in that directory. Link only $(XEN_ROOT)/xen/include/acpi under tools/include instead. Build tested on ARM64 and x86_64. Signed-off-by: Stefano Stabellini Tested-by: Steve Capper Acked-by: Wei Liu --- tools/include/Makefile | 1 + tools/libxl/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/include/Makefile b/tools/include/Makefile index dec8b3d352..d95d8375ba 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -20,6 +20,7 @@ xen/.dir: ln -sf ../xen-sys/$(XEN_OS) xen/sys ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign + ln -s $(XEN_ROOT)/xen/include/acpi acpi touch $@ # Not xen/xsm as that clashes with link to diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index c4e4117909..dac19ac09b 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -96,7 +96,7 @@ dsdt_anycpu_arm.c: $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) libxl_arm_acpi.o: libxl_arm_acpi.c - $(CC) -c $(CFLAGS) -I../../xen/include/ -o $@ libxl_arm_acpi.c + $(CC) -c $(CFLAGS) -o $@ libxl_arm_acpi.c else LIBXL_OBJS-$(CONFIG_ARM) += libxl_arm_no_acpi.o endif -- 2.30.2