From df0fd92cc3a713f11874af369eb5f54c560d8b1f Mon Sep 17 00:00:00 2001
From: Tomasz Grabiec <tgrabiec@cloudius-systems.com>
Date: Thu, 13 Feb 2014 11:06:10 +0100
Subject: [PATCH] build: build java artifacts before processing modules

Currently files which are part of 'java' module are built as part of
the main osv build. These files need to be ready before the module is
processed because the module relies on them.

Because we didn't have explicit dependency between processing modules
and building java artifacts the build failed when parallel jobs were
used. The proper fix is to move all java stuff to modules/java so that it
would be built as part of the module build. Before that happens here's
a quick fix which adds explicit dependency to build.mk.

Signed-off-by: Tomasz Grabiec <tgrabiec@cloudius-systems.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
 build.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.mk b/build.mk
index 234bcc642..2b109f2a1 100644
--- a/build.mk
+++ b/build.mk
@@ -772,7 +772,7 @@ $(src)/modules/tests/usr.manifest: $(src)/build.mk
 ################################################################################
 
 .PHONY: process-modules
-process-modules: bootfs.manifest.skel usr.manifest.skel $(src)/modules/tests/usr.manifest
+process-modules: bootfs.manifest.skel usr.manifest.skel $(src)/modules/tests/usr.manifest $(java-targets)
 	cd $(out)/module \
 	  && jdkbase=$(jdkbase) OSV_BASE=$(src) OSV_BUILD_PATH=$(out) $(src)/scripts/module.py --image-config $(image)
 
-- 
GitLab