[CRIU] [PATCH] built: criu -- Fast fix for concurrent build

[Cyrill Gorcunov]

Will beautify later -- just explicitly link
with syscalls and arch-lib, cause we're
switched to phonytargets for deps sake.

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

diff --git a/criu/Makefile b/criu/Makefile
index e9a1f91da2a5..97741851ba6a 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -106,7 +106,7 @@ syscalls_lib: config
 #
 # Architecture dependant part.
 ARCH-LIB		:= $(ARCH_DIR)/crtools.built-in.o
-arch_lib: config syscalls_lib
+arch_lib: syscalls_lib
 	$(Q) $(MAKE) $(call build-as,Makefile,$(ARCH_DIR)) all
 .PHONY: arch_lib
 
@@ -124,7 +124,7 @@ endif
 
 #
 # PIE library code.
-pie/lib.a: arch_lib syscalls_lib
+pie/lib.a: arch_lib
 	$(Q) $(MAKE) $(call build-as,Makefile.library,pie) all
 
 #
@@ -138,15 +138,13 @@ pie: $(piegen-bin) pie/lib.a
 PROGRAM-BUILTINS	+= ../images/built-in.o
 PROGRAM-BUILTINS	+= built-in.o
 PROGRAM-BUILTINS	+= pie/lib.a
-PROGRAM-BUILTINS	+= $(SYSCALL-LIB)
-PROGRAM-BUILTINS	+= $(ARCH-LIB)
 
 built-in.o: pie
 	$(Q) $(MAKE) $(call build-as,Makefile.crtools,.) all
 
 criu: $(PROGRAM-BUILTINS)
 	$(call msg-link, $@)
-	$(Q) $(CC) $(CFLAGS) $^ $(LIBS) $(LDFLAGS) $(GMONLDOPT) -rdynamic -o $@
+	$(Q) $(CC) $(CFLAGS) $^ $(SYSCALL-LIB) $(ARCH-LIB) $(LIBS) $(LDFLAGS) $(GMONLDOPT) -rdynamic -o $@
 
 #
 # Cleanup everything.
-- 
2.5.0