Commit f5c42711 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Andrei Vagin

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: 's avatarCyrill Gorcunov <gorcunov@gmail.com>
Reviewed-by: 's avatarDmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 3c044783
...@@ -27,8 +27,6 @@ compel-plugins += compel/plugins/std.lib.a compel/plugins/fds.lib.a ...@@ -27,8 +27,6 @@ compel-plugins += compel/plugins/std.lib.a compel/plugins/fds.lib.a
LIBCOMPEL_SO := libcompel.so LIBCOMPEL_SO := libcompel.so
LIBCOMPEL_A := libcompel.a LIBCOMPEL_A := libcompel.a
export LIBCOMPEL_SO LIBCOMPEL_A export LIBCOMPEL_SO LIBCOMPEL_A
criu-deps += compel/$(LIBCOMPEL_A)
criu-deps += $(compel-plugins)
# #
# Compel itself. # Compel itself.
...@@ -38,6 +36,12 @@ compel/%: $(compel-deps) $(compel-plugins) .FORCE ...@@ -38,6 +36,12 @@ compel/%: $(compel-deps) $(compel-plugins) .FORCE
criu-deps += compel/compel-host-bin 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 # Plugins
compel/plugins/Makefile: ; compel/plugins/Makefile: ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment