Commit a56f0cf1 authored by Pavel Emelyanov's avatar Pavel Emelyanov

make: Fixup dependency on config.h after pulling patches from -dev

In -dev branch the deps scheme is different as we have soccr and
compel bits there, so in master the criu vs piegen vs config
deps should look differently.
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent ba591928
...@@ -211,7 +211,7 @@ $(eval $(call gen-built-in,images)) ...@@ -211,7 +211,7 @@ $(eval $(call gen-built-in,images))
# the nmk so we can reuse it there. # the nmk so we can reuse it there.
criu/%: images/built-in.o $(VERSION_HEADER) .FORCE criu/%: images/built-in.o $(VERSION_HEADER) .FORCE
$(Q) $(MAKE) $(build)=criu $@ $(Q) $(MAKE) $(build)=criu $@
criu: images/built-in.o $(VERSION_HEADER) criu: images/built-in.o $(VERSION_HEADER) $(CONFIG_HEADER)
$(Q) $(MAKE) $(build)=criu all $(Q) $(MAKE) $(build)=criu all
.PHONY: criu .PHONY: criu
......
...@@ -50,7 +50,7 @@ $(ARCH-LIB): syscalls_lib ...@@ -50,7 +50,7 @@ $(ARCH-LIB): syscalls_lib
ifeq ($(piegen-y),y) ifeq ($(piegen-y),y)
piegen-bin := criu/pie/piegen/piegen piegen-bin := criu/pie/piegen/piegen
criu/pie/piegen/%: config criu/pie/piegen/%: $(CONFIG_HEADER)
$(Q) CC=$(HOSTCC) LD=$(HOSTLD) CFLAGS="$(ccflags-y) $(HOSTCFLAGS) $(WARNINGS) $(DEFINES)" $(MAKE) $(build)=criu/pie/piegen $@ $(Q) CC=$(HOSTCC) LD=$(HOSTLD) CFLAGS="$(ccflags-y) $(HOSTCFLAGS) $(WARNINGS) $(DEFINES)" $(MAKE) $(build)=criu/pie/piegen $@
$(piegen-bin): criu/pie/piegen/built-in.o $(piegen-bin): criu/pie/piegen/built-in.o
$(call msg-link, $@) $(call msg-link, $@)
......
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