From c4030e283b5da5831d5bbbda6ddb2dbaed84b6a6 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Wed, 21 Sep 2016 23:54:31 +0300 Subject: [PATCH] compel: criu -- Use compel-host program compel-host is needed to build criu itself and run during piegen blob generation. Signed-off-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov Signed-off-by: Andrei Vagin --- Makefile | 4 ++-- criu/pie/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1c8702beb..6cbbdd220 100644 --- a/Makefile +++ b/Makefile @@ -226,9 +226,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/compel $(VERSION_HEADER) $(CONFIG_HEADER) .FORCE +criu/%: images/built-in.o compel/compel-host $(VERSION_HEADER) $(CONFIG_HEADER) .FORCE $(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 .PHONY: criu diff --git a/criu/pie/Makefile b/criu/pie/Makefile index eff91cc70..df3cd821f 100644 --- a/criu/pie/Makefile +++ b/criu/pie/Makefile @@ -57,9 +57,9 @@ CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0 ccflags-y += -DCR_NOGLIBC 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) - COMPAT_CFLAGS := $(shell $(SRC_DIR)/compel/compel --arch=ia32 cflags) + COMPAT_CFLAGS := $(shell $(SRC_DIR)/compel/compel-host --arch=ia32 cflags) endif endif @@ -157,9 +157,9 @@ $(obj)/parasite-$(1).built-in.bin.o: $(obj)/$(1).built-in.o \ endef $(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, $@) - $(Q) $(SRC_DIR)/compel/compel piegen -f $< \ + $(Q) $(SRC_DIR)/compel/compel-host piegen -f $< \ -v $(call target-name,$@)_relocs \ -p $(call target-name,$@)_blob_offset__ \ -s $(call target-name,$@)_blob \