Hi Andrew, > On 11 Jun 2020, at 17:24, Andrew Cooper <[email protected]> wrote: > > On 11/06/2020 12:54, Bertrand Marquis wrote: >> Use $(BASEDIR)/include instead of $(XEN_ROOT)/xen/include for the >> include path to be coherent with the rest of the Makefiles. >> >> Signed-off-by: Bertrand Marquis <[email protected]> > > Does something subtle break before this change?
Without changing anything no. But if xen sub-directory is renamed yes. As there is no easy way to build xen hypervisor out of tree (I might be wrong here !) I found a solution using cp -rs from xen subdir in a xen-build1 xen-build2 etc this way I can check build for x86 and arm without cleaning. Without the patch, the sources are actually compiles with an include path containing xen/../xen as a result of using XEN_ROOT which does not allow to rename xen subdirectory. As it was the only place in which XEN_ROOT was used for include paths, this is normalising the paths. Bertrand > > ~Andrew > >> --- >> xen/arch/x86/boot/build32.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk >> index 5851ebff5f..8cd5403926 100644 >> --- a/xen/arch/x86/boot/build32.mk >> +++ b/xen/arch/x86/boot/build32.mk >> @@ -5,7 +5,7 @@ include $(XEN_ROOT)/Config.mk >> $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) >> >> CFLAGS += -Werror -fno-builtin -g0 -msoft-float >> -CFLAGS += -I$(XEN_ROOT)/xen/include >> +CFLAGS += -I$(BASEDIR)/include >> CFLAGS := $(filter-out -flto,$(CFLAGS)) >> >> # NB. awk invocation is a portable alternative to 'head -n -1' >
