From f5c427116d361a226a8a8d8c28cda275dac0e7ea Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 12 Jul 2018 15:51:42 +0300 Subject: [PATCH] compel: Make sure the hostprog is built early 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 Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by: Andrei Vagin --- Makefile.compel | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.compel b/Makefile.compel index 8768c795d..764afadc8 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: ;