Commit 5680186b authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

built: criu -- Fast fix for concurrent build

Will beautify later -- just explicitly link
with syscalls and arch-lib, cause we're
switched to phonytargets for deps sake.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 13732110
...@@ -106,7 +106,7 @@ syscalls_lib: config ...@@ -106,7 +106,7 @@ syscalls_lib: config
# #
# Architecture dependant part. # Architecture dependant part.
ARCH-LIB := $(ARCH_DIR)/crtools.built-in.o 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 $(Q) $(MAKE) $(call build-as,Makefile,$(ARCH_DIR)) all
.PHONY: arch_lib .PHONY: arch_lib
...@@ -124,7 +124,7 @@ endif ...@@ -124,7 +124,7 @@ endif
# #
# PIE library code. # PIE library code.
pie/lib.a: arch_lib syscalls_lib pie/lib.a: arch_lib
$(Q) $(MAKE) $(call build-as,Makefile.library,pie) all $(Q) $(MAKE) $(call build-as,Makefile.library,pie) all
# #
...@@ -138,15 +138,13 @@ pie: $(piegen-bin) pie/lib.a ...@@ -138,15 +138,13 @@ pie: $(piegen-bin) pie/lib.a
PROGRAM-BUILTINS += ../images/built-in.o PROGRAM-BUILTINS += ../images/built-in.o
PROGRAM-BUILTINS += built-in.o PROGRAM-BUILTINS += built-in.o
PROGRAM-BUILTINS += pie/lib.a PROGRAM-BUILTINS += pie/lib.a
PROGRAM-BUILTINS += $(SYSCALL-LIB)
PROGRAM-BUILTINS += $(ARCH-LIB)
built-in.o: pie built-in.o: pie
$(Q) $(MAKE) $(call build-as,Makefile.crtools,.) all $(Q) $(MAKE) $(call build-as,Makefile.crtools,.) all
criu: $(PROGRAM-BUILTINS) criu: $(PROGRAM-BUILTINS)
$(call msg-link, $@) $(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. # Cleanup everything.
......
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