summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-14 18:01:56 (GMT)
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-02 17:17:56 (GMT)
commit80914ab63c00080b0b4b9ba54f072c261f86153d (patch)
treee7ed147388c43d293f8934878af3b9d50882abe8
parent732da233f3e2d8779adeb18ef10091f92691559a (diff)
downloadbuild-80914ab63c00080b0b4b9ba54f072c261f86153d.zip
build-80914ab63c00080b0b4b9ba54f072c261f86153d.tar.gz
build-80914ab63c00080b0b4b9ba54f072c261f86153d.tar.bz2
Add relocation packer as dependency
Relocation packer is built from source. Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--core/config.mk2
-rw-r--r--core/dynamic_binary.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk
index d1a0464..1b62e94 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -512,7 +512,7 @@ DX := $(HOST_OUT_EXECUTABLES)/dx
ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX)
# relocation packer
-RELOCATION_PACKER := $(HOST_OUT_EXECUTABLES)/relocation_packer$(HOST_EXECUTABLE_SUFFIX)
+RELOCATION_PACKER := $(BUILD_OUT_EXECUTABLES)/relocation_packer$(BUILD_EXECUTABLE_SUFFIX)
FINDBUGS := /usr/bin/findbugs
EMMA_JAR := /usr/share/java/emma$(COMMON_JAVA_PACKAGE_SUFFIX)
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index a4224cd..7fb587b 100644
--- a/core/dynamic_binary.mk
+++ b/core/dynamic_binary.mk
@@ -72,6 +72,7 @@ endif
ifeq (true,$(my_pack_module_relocations))
# Pack relocations
+$(relocation_packer_output): $(RELOCATION_PACKER)
$(relocation_packer_output): $(relocation_packer_input) | $(ACP)
$(pack-elf-relocations)
else