[CRIU] [PATCH 28/38] criu: Wire in compel library

Cyrill Gorcunov gorcunov at openvz.org
Tue Oct 11 09:04:18 PDT 2016


We will use it anyway so lets link
earlier for vrification sake.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 Makefile      | 4 ++--
 criu/Makefile | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 37ae7cb6b7d3..7a57aa5ae3ab 100644
--- a/Makefile
+++ b/Makefile
@@ -223,9 +223,9 @@ $(SOCCR_A): |soccr/built-in.o
 #
 # But note that we're already included
 # the nmk so we can reuse it there.
-criu/%: images/built-in.o compel/plugins/std.built-in.o compel/compel-host $(VERSION_HEADER) .FORCE
+criu/%: images/built-in.o compel/plugins/std.built-in.o compel/lib.a compel/compel-host $(VERSION_HEADER) .FORCE
 	$(Q) $(MAKE) $(build)=criu $@
-criu: images/built-in.o compel/plugins/std.built-in.o compel/compel-host $(SOCCR_A) $(VERSION_HEADER)
+criu: images/built-in.o compel/plugins/std.built-in.o compel/lib.a compel/compel-host $(SOCCR_A) $(VERSION_HEADER)
 	$(Q) $(MAKE) $(build)=criu all
 .PHONY: criu
 
diff --git a/criu/Makefile b/criu/Makefile
index cf962d4ef4ef..19af713a3c87 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -71,6 +71,7 @@ criu/pie/%: pie
 PROGRAM-BUILTINS	+= criu/pie/native.lib.a
 PROGRAM-BUILTINS	+= images/built-in.o
 PROGRAM-BUILTINS	+= $(obj)/built-in.o
+PROGRAM-BUILTINS	+= compel/lib.a
 PROGRAM-BUILTINS	+= $(ARCH-LIB)
 
 $(obj)/built-in.o: pie
-- 
2.7.4



More information about the CRIU mailing list