[openwrt/openwrt] include: extend SetupHostCommand macro to accept more arguments
LEDE Commits
lede-commits at lists.infradead.org
Thu Apr 5 04:58:30 PDT 2018
jow pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/e9eb9393f4e632338d72d62512a2f74272bd8528
commit e9eb9393f4e632338d72d62512a2f74272bd8528
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Thu Apr 5 13:54:41 2018 +0200
include: extend SetupHostCommand macro to accept more arguments
Commit d6d3db0543 added more gcc version probes, exceeding the argument
limit of the SetupHostCommand macro, leading to failing GCC/LLVM tests
on OS X.
Extend the handled number of arguments to restore proper functionality.
Fixes FS#1470
Fixes d6d3db0543 ("build: Improve GCC version detection")
Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
include/prereq.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/prereq.mk b/include/prereq.mk
index 6cb590e..0f0f253 100644
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -90,7 +90,8 @@ define SetupHostCommand
for cmd in $(call QuoteHostCommand,$(3)) $(call QuoteHostCommand,$(4)) \
$(call QuoteHostCommand,$(5)) $(call QuoteHostCommand,$(6)) \
$(call QuoteHostCommand,$(7)) $(call QuoteHostCommand,$(8)) \
- $(call QuoteHostCommand,$(9)); do \
+ $(call QuoteHostCommand,$(9)) $(call QuoteHostCommand,$(10)) \
+ $(call QuoteHostCommand,$(11)) $(call QuoteHostCommand,$(12)); do \
if [ -n "$$$$$$$$cmd" ]; then \
bin="$$$$$$$$(PATH="$(subst $(space),:,$(filter-out $(STAGING_DIR_HOST)/%,$(subst :,$(space),$(PATH))))" \
which "$$$$$$$${cmd%% *}")"; \
More information about the lede-commits
mailing list