[CRIU] [PATCH 11/11] compel: Make sure the hostprog is built early
Cyrill Gorcunov
gorcunov at gmail.com
Thu Jul 12 15:51:42 MSK 2018
The host compel-host-bin must be built before
criu, same time the criu itself should not depend
on libcompel or plugins because they are the part
of the compel package.
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
Makefile.compel | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile.compel b/Makefile.compel
index 8768c795d933..764afadc812a 100644
--- a/Makefile.compel
+++ b/Makefile.compel
@@ -27,8 +27,6 @@ compel-plugins += compel/plugins/std.lib.a compel/plugins/fds.lib.a
LIBCOMPEL_SO := libcompel.so
LIBCOMPEL_A := libcompel.a
export LIBCOMPEL_SO LIBCOMPEL_A
-criu-deps += compel/$(LIBCOMPEL_A)
-criu-deps += $(compel-plugins)
#
# Compel itself.
@@ -38,6 +36,12 @@ compel/%: $(compel-deps) $(compel-plugins) .FORCE
criu-deps += compel/compel-host-bin
+#
+# Make sure the host program is ready after the
+# library and plugins are built.
+compel/compel-host-bin: | compel/$(LIBCOMPEL_A) $(compel-plugins)
+$(COMPEL_BIN): compel/compel-host-bin
+
#
# Plugins
compel/plugins/Makefile: ;
--
2.14.4
More information about the CRIU
mailing list