Commit 4aaac6d4 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

build: Simplify piegen usage

- no need for phony pie/piegen, redundant and rather may
  cause double execution of a target;
- drop $(ARCH_DIR) from pie deps, initially it should be syscall-lib,
  but pie/lib.a already has it.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Tested-by: 's avatarLaurent Dufour <ldufour@linux.vnet.ibm.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent c271e13f
...@@ -110,16 +110,13 @@ PHONY += $(ARCH-LIB) ...@@ -110,16 +110,13 @@ PHONY += $(ARCH-LIB)
# #
# piegen tool needed for PIE code. # piegen tool needed for PIE code.
ifeq ($(piegen-y),y) ifeq ($(piegen-y),y)
piegen := pie/piegen/piegen piegen-bin := pie/piegen/piegen
pie/piegen/%: config pie/piegen/%: config
$(Q) CC=$(HOSTCC) LD=$(HOSTLD) CFLAGS="$(HOSTCFLAGS) $(WARNINGS) $(DEFINES)" $(MAKE) $(build)=pie/piegen $@ $(Q) CC=$(HOSTCC) LD=$(HOSTLD) CFLAGS="$(HOSTCFLAGS) $(WARNINGS) $(DEFINES)" $(MAKE) $(build)=pie/piegen $@
pie/piegen: config $(piegen-bin): pie/piegen/built-in.o
$(Q) CC=$(HOSTCC) LD=$(HOSTLD) CFLAGS="$(HOSTCFLAGS) $(WARNINGS) $(DEFINES)" $(MAKE) $(build)=pie/piegen all
$(piegen): pie/piegen/built-in.o
$(call msg-link, $@) $(call msg-link, $@)
$(Q) $(HOSTCC) $(HOSTCFLAGS) $^ $(LDFLAGS) -o $@ $(Q) $(HOSTCC) $(HOSTCFLAGS) $^ $(LDFLAGS) -o $@
PHONY += pie/piegen
endif endif
# #
...@@ -129,7 +126,7 @@ pie/lib.a: $(ARCH-LIB) $(SYSCALL-LIB) ...@@ -129,7 +126,7 @@ pie/lib.a: $(ARCH-LIB) $(SYSCALL-LIB)
# #
# PIE code blobs themseves. # PIE code blobs themseves.
pie: $(ARCH_DIR) $(piegen) pie/lib.a pie: $(piegen-bin) pie/lib.a
$(Q) $(MAKE) $(build)=pie all $(Q) $(MAKE) $(build)=pie all
PHONY += pie PHONY += pie
......
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