Commit 2812d04d authored by Filipe Brandenburger's avatar Filipe Brandenburger Committed by Pavel Emelyanov

make: fix "make criu" after arch-specific vdso broke it

Building criu with "make criu" on a clean tree was not working, failing on:

  make[1]: *** No rule to make target `arch/x86/vdso-pie.o'.  Stop.
  make: *** [arch/x86/vdso-pie.o] Error 2

git bisect traced the regression to commit c473461d (vdso: Make it arch
specific) which apparently dropped the rule to build $(ARCH_DIR)/vdso-pie.o
using the pie rule.  Restore the dependency for "make criu" to work again from
a clean tree.

Tested:
$ git clean -fdx
$ make criu

Fixes: c473461dSigned-off-by: 's avatarFilipe Brandenburger <filbranden@google.com>
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent c05b7f41
...@@ -172,8 +172,11 @@ lib: $(VERSION_HEADER) config built-in.o ...@@ -172,8 +172,11 @@ lib: $(VERSION_HEADER) config built-in.o
$(Q) $(MAKE) $(build)=lib all $(Q) $(MAKE) $(build)=lib all
ifeq ($(VDSO),y) ifeq ($(VDSO),y)
$(ARCH_DIR)/vdso-pie.o: pie
$(Q) $(MAKE) $(build)=pie $(ARCH_DIR)/vdso-pie.o
PROGRAM-BUILTINS += $(ARCH_DIR)/vdso-pie.o PROGRAM-BUILTINS += $(ARCH_DIR)/vdso-pie.o
endif endif
PROGRAM-BUILTINS += pie/util-fd.o PROGRAM-BUILTINS += pie/util-fd.o
PROGRAM-BUILTINS += pie/util.o PROGRAM-BUILTINS += pie/util.o
PROGRAM-BUILTINS += protobuf/built-in.o PROGRAM-BUILTINS += protobuf/built-in.o
......
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