diff --git a/criu/Makefile b/criu/Makefile index 4f4d673b5..c2ee5757f 100644 --- a/criu/Makefile +++ b/criu/Makefile @@ -52,12 +52,12 @@ $(ARCH-LIB): syscalls_lib # # PIE library code. -criu/pie/lib.a: $(ARCH-LIB) +criu/pie/native.lib.a: $(ARCH-LIB) $(Q) $(MAKE) $(call build-as,Makefile.library,criu/pie) all # # PIE code blobs themseves. -pie: criu/pie/lib.a +pie: criu/pie/native.lib.a $(Q) $(MAKE) $(build)=criu/pie all .PHONY: pie @@ -66,7 +66,7 @@ criu/pie/%: pie # # CRIU executable -PROGRAM-BUILTINS += criu/pie/lib.a +PROGRAM-BUILTINS += criu/pie/native.lib.a PROGRAM-BUILTINS += images/built-in.o PROGRAM-BUILTINS += $(obj)/built-in.o PROGRAM-BUILTINS += $(ARCH-LIB) diff --git a/criu/pie/Makefile b/criu/pie/Makefile index c0eb2db8a..b7db1a374 100644 --- a/criu/pie/Makefile +++ b/criu/pie/Makefile @@ -79,9 +79,9 @@ ifeq ($(strip $(V)),) piegen_stdout := >/dev/null endif -$(obj)/%.built-in.bin.o: $(obj)/%.built-in.o $(obj)/lib.a $(obj)/$(PIELDS) +$(obj)/%.built-in.bin.o: $(obj)/%.built-in.o $(obj)/native.lib.a $(obj)/$(PIELDS) $(call msg-gen, $@) - $(Q) $(LD) -r -T $(obj)/$(PIELDS) -o $@ $< $(obj)/lib.a + $(Q) $(LD) -r -T $(obj)/$(PIELDS) -o $@ $< $(obj)/native.lib.a $(obj)/%-blob.h: $(obj)/%.built-in.bin.o $(obj)/$(PIELDS) compel/compel $(call msg-gen, $@) diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library index dce650a51..1958393b4 100644 --- a/criu/pie/Makefile.library +++ b/criu/pie/Makefile.library @@ -1,26 +1,28 @@ -lib-y += log-simple.o -lib-y += util-fd.o -lib-y += util.o -lib-y += string.o +target := native + +$(target)-lib-y += log-simple.o +$(target)-lib-y += util-fd.o +$(target)-lib-y += util.o +$(target)-lib-y += string.o ifeq ($(VDSO),y) - lib-y += util-vdso.o - lib-y += parasite-vdso.o - lib-y += ./$(ARCH_DIR)/vdso-pie.o + $(target)-lib-y += util-vdso.o + $(target)-lib-y += parasite-vdso.o + $(target)-lib-y += ./$(ARCH_DIR)/vdso-pie.o ifeq ($(SRCARCH),aarch64) - lib-y += ./$(ARCH_DIR)/intraprocedure.o + $(target)-lib-y += ./$(ARCH_DIR)/intraprocedure.o endif ifeq ($(SRCARCH),ppc64) - lib-y += ./$(ARCH_DIR)/vdso-trampoline.o + $(target)-lib-y += ./$(ARCH_DIR)/vdso-trampoline.o endif endif ifeq ($(SRCARCH),ppc64) - lib-y += ./$(ARCH_DIR)/memcpy_power7.o - lib-y += ./$(ARCH_DIR)/memcmp_64.o - lib-y += ./$(ARCH_DIR)/misc.o + $(target)-lib-y += ./$(ARCH_DIR)/memcpy_power7.o + $(target)-lib-y += ./$(ARCH_DIR)/memcmp_64.o + $(target)-lib-y += ./$(ARCH_DIR)/misc.o endif ifeq ($(SRCARCH),x86)