From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 16 Sep 2015 12:38:16 +0000 (+0000)
Subject: build: do not overwrite already existing host commands
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4d01d6ccb1abc9939907f82de7e96d63ca8091ed;p=librecmc%2Flibrecmc.git

build: do not overwrite already existing host commands

This prevents a later prereq check from overwriting the installed tar
binary.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 46982
---

diff --git a/include/prereq.mk b/include/prereq.mk
index 33ac278232..6cb590e360 100644
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -86,6 +86,7 @@ endef
 # 3+: candidates
 define SetupHostCommand
   define Require/$(1)
+	[ -f "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0; \
 	for cmd in $(call QuoteHostCommand,$(3)) $(call QuoteHostCommand,$(4)) \
 	           $(call QuoteHostCommand,$(5)) $(call QuoteHostCommand,$(6)) \
 	           $(call QuoteHostCommand,$(7)) $(call QuoteHostCommand,$(8)) \