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

compel: criu -- Use compel-host program

Browse Source 
compel-host is needed to build criu itself and
run during piegen blob generation.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov
2016-09-21 23:54:31 +03:00
committed by Andrei Vagin
parent f20a124269
commit c4030e283b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -226,9 +226,9 @@ $(SOCCR_A): |soccr/built-in.o
# #
# But note that we're already included # But note that we're already included
# the nmk so we can reuse it there. # the nmk so we can reuse it there.
criu/%: images/built-in.o compel/compel $(VERSION_HEADER) $(CONFIG_HEADER) .FORCE criu/%: images/built-in.o compel/compel-host $(VERSION_HEADER) $(CONFIG_HEADER) .FORCE
$(Q) $(MAKE) $(build)=criu $@ $(Q) $(MAKE) $(build)=criu $@
criu: images/built-in.o compel/compel $(SOCCR_A) $(VERSION_HEADER) $(CONFIG_HEADER) criu: images/built-in.o compel/compel-host $(SOCCR_A) $(VERSION_HEADER) $(CONFIG_HEADER)
$(Q) $(MAKE) $(build)=criu all $(Q) $(MAKE) $(build)=criu all
.PHONY: criu .PHONY: criu

8
criu/pie/Makefile
View File

@@ -57,9 +57,9 @@ CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
ccflags-y += -DCR_NOGLIBC ccflags-y += -DCR_NOGLIBC
ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),) ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),)
NATIVE_CFLAGS := $(shell $(SRC_DIR)/compel/compel --arch=$(ARCH) cflags) NATIVE_CFLAGS := $(shell $(SRC_DIR)/compel/compel-host --arch=$(ARCH) cflags)
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
COMPAT_CFLAGS := $(shell $(SRC_DIR)/compel/compel --arch=ia32 cflags) COMPAT_CFLAGS := $(shell $(SRC_DIR)/compel/compel-host --arch=ia32 cflags)
endif endif
endif endif
@@ -157,9 +157,9 @@ $(obj)/parasite-$(1).built-in.bin.o: $(obj)/$(1).built-in.o \
endef endef
$(eval $(call map,gen-rule-built-in.bin.o,$(parasite_target))) $(eval $(call map,gen-rule-built-in.bin.o,$(parasite_target)))
$(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(SRC_DIR)/compel/compel $(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(SRC_DIR)/compel/compel-host
$(call msg-gen, $@) $(call msg-gen, $@)
$(Q) $(SRC_DIR)/compel/compel piegen -f $< \ $(Q) $(SRC_DIR)/compel/compel-host piegen -f $< \
-v $(call target-name,$@)_relocs \ -v $(call target-name,$@)_relocs \
-p $(call target-name,$@)_blob_offset__ \ -p $(call target-name,$@)_blob_offset__ \
-s $(call target-name,$@)_blob \ -s $(call target-name,$@)_blob \