tools/Makefile: unset MAKELEVEL before building QEMU
authorAnthony PERARD <anthony.perard@citrix.com>
Thu, 19 Oct 2017 14:29:56 +0000 (15:29 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 20 Oct 2017 10:37:20 +0000 (11:37 +0100)
Since QEMU commits aef45d51d1204f3335fb99de6658e0c5612c2b67
"build: automatically handle GIT submodule checkout for dtc"
the QEMU makefiles rely on the variable MAKELEVEL to make a decision on
whether to update some git submodules or not. Since we call QEMU build
from within the Xen one, MAKELEVEL would already be greater than 0 and
the git submodules would not be updated and QEMU would fail to build.

Fix this by removing MAKELEVEL from the environment before trying to
build QEMU.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Release-acked-by: Julien Grall <julien.grall@linaro.org>
tools/Makefile

index 84d6e3b4e4e99b6bd000720b3899b7ec60246532..ab7a01ee1bee116fa8dd623fad64ac45193f8345 100644 (file)
@@ -217,6 +217,7 @@ QEMU_XEN_ENABLE_DEBUG :=
 endif
 
 subdir-all-qemu-xen-dir: qemu-xen-dir-find
+       unset MAKELEVEL; \
        if test -d $(QEMU_UPSTREAM_LOC) ; then \
                source=$(QEMU_UPSTREAM_LOC); \
        else \