mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 13:58:34 +00:00
Code Issues Releases Wiki Activity

build: Fix criu depdendent parts linking

Browse Source 
When link criu we make sure that all underlied
systems are up to day: images, syscalls, pie
part. Thus provide own targets for them and
link on a final pass.

This should fix the problem when some file
in images|syscalls|pie are changed but criu
itself is not rebuilt and relinked.

NB: Need to revisit the config/version/feature-test
generations too.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov 2016-02-24 20:25:00 +03:00 committed by Pavel Emelyanov
parent d550e2017d
commit f8dfdd9ffb
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
criu/Makefile
View File

@ -99,14 +99,16 @@ config: $(VERSION_HEADER)
#
# System calls library.
SYSCALL-LIB := $(ARCH_DIR)/syscalls.built-in.o
$(SYSCALL-LIB): config
syscalls_lib: config
$(Q) $(MAKE) $(call build-as,Makefile.syscalls,$(ARCH_DIR)) all
.PHONY: syscalls_lib
#
# Architecture dependant part.
ARCH-LIB := $(ARCH_DIR)/crtools.built-in.o
$(ARCH-LIB): config $(SYSCALL-LIB)
$(Q) $(MAKE) $(call build-as,Makefile,$(ARCH_DIR)) $@
arch_lib: config syscalls_lib
$(Q) $(MAKE) $(call build-as,Makefile,$(ARCH_DIR)) all
.PHONY: arch_lib
#
# piegen tool needed for PIE code.
@ -122,7 +124,7 @@ endif
#
# PIE library code.
pie/lib.a: $(ARCH-LIB) $(SYSCALL-LIB)
pie/lib.a: arch_lib syscalls_lib
$(Q) $(MAKE) $(call build-as,Makefile.library,pie) all
#
@ -137,8 +139,7 @@ PROGRAM-BUILTINS += ../images/built-in.o
PROGRAM-BUILTINS += built-in.o
PROGRAM-BUILTINS += pie/lib.a
PROGRAM-BUILTINS += $(SYSCALL-LIB)
LIBS += arch/$(ARCH)/crtools.built-in.o
PROGRAM-BUILTINS += $(ARCH-LIB)
built-in.o: pie
$(Q) $(MAKE) $(call build-as,Makefile.crtools,.) all