[Xen-devel] [PATCH] x86/shim: Fix parallel build following c/s 32b1d62887d0

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

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 also need to depend on the linkfarm being
established first.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Wei Liu <wl@xxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 tools/firmware/xen-dir/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 7435421251..6ed0cb6888 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -38,7 +38,7 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
                }
 
 # Copy enough of the tree to build the shim hypervisor
-$(D): linkfarm.stamp
+$(D) $(D)/xen/arch/x86/configs/pvshim_defconfig: linkfarm.stamp
        $(MAKE) -C $(D)/xen distclean
 
 $(D)/xen/.config: $(D) $(D)/xen/arch/x86/configs/pvshim_defconfig
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel