From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 5 Aug 2019 13:48:21 +0000 (+0100)
Subject: x86/shim: Fix parallel build following c/s 32b1d62887d0
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fstaging;p=people%2Fdwmw2%2Fxen.git

x86/shim: Fix parallel build following c/s 32b1d62887d0

Unfortunately, a parallel build from clean can fail in the following manner:

  xen.git$ make -j4 -C tools/firmware/xen-dir/
  make: Entering directory '/local/xen.git/tools/firmware/xen-dir'
  mkdir -p xen-root
  make: *** No rule to make target 'xen-root/xen/arch/x86/configs/pvshim_defconfig', needed by 'xen-root/xen/.config'.  Stop.
  make: *** Waiting for unfinished jobs....

The rule for pvshim_defconfig needs to depend on the linkfarm, rather than
$(D)/xen/.config specifically.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 7435421251..697bbbd57b 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -41,7 +41,9 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
 $(D): linkfarm.stamp
 	$(MAKE) -C $(D)/xen distclean
 
-$(D)/xen/.config: $(D) $(D)/xen/arch/x86/configs/pvshim_defconfig
+$(D)/xen/arch/x86/configs/pvshim_defconfig: $(D)
+
+$(D)/xen/.config: $(D)/xen/arch/x86/configs/pvshim_defconfig
 	$(MAKE) -C $(@D) KBUILD_DEFCONFIG=pvshim_defconfig XEN_CONFIG_EXPERT=y defconfig
 
 xen-shim: $(D)/xen/.config