[Xen-changelog] [xen master] ARM64: fix libxl build, do not include ../../xen/include

[patchbot@xxxxxxx]

commit 9c635883ded517e8d300f36b8e1b31a636278769
Author:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
AuthorDate: Tue Oct 18 12:32:50 2016 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Tue Oct 18 12:33:09 2016 +0100

    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 <sstabellini@xxxxxxxxxx>
    Tested-by: Steve Capper <steve.capper@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 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 dec8b3d..d95d837 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 c4e4117..dac19ac 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog