[xen master] tools/Makefile: unset MAKELEVEL before building QEMU

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

[xen master] tools/Makefile: unset MAKELEVEL before building QEMU

commit 575da5ceb427ce649eb22c1aea105af147d22487
Author:     Anthony PERARD <[hidden email]>
AuthorDate: Thu Oct 19 15:29:56 2017 +0100
Commit:     Ian Jackson <[hidden email]>
CommitDate: Fri Oct 20 11:37:20 2017 +0100

    tools/Makefile: unset MAKELEVEL before building QEMU
    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 <[hidden email]>
    Acked-by: Ian Jackson <[hidden email]>
    Release-acked-by: Julien Grall <[hidden email]>
 tools/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/Makefile b/tools/Makefile
index 84d6e3b..ab7a01e 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -217,6 +217,7 @@ QEMU_XEN_ENABLE_DEBUG :=
 subdir-all-qemu-xen-dir: qemu-xen-dir-find
+ unset MAKELEVEL; \
  if test -d $(QEMU_UPSTREAM_LOC) ; then \
  source=$(QEMU_UPSTREAM_LOC); \
  else \
generated by git-patchbot for /home/xen/git/xen.git#master

Xen-changelog mailing list
[hidden email]