summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-05-10 03:48:54 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-05-10 03:48:54 (GMT)
commit20969b96453e289f59d170dad0a1ee1614fb62fa (patch)
treede547d12a0dab166b95ae3477dc99475d6e6279a /Makefile
parentca67cde2e5090257812d60ee9c43cae3bf313b13 (diff)
downloadmxe-20969b96453e289f59d170dad0a1ee1614fb62fa.zip
mxe-20969b96453e289f59d170dad0a1ee1614fb62fa.tar.gz
mxe-20969b96453e289f59d170dad0a1ee1614fb62fa.tar.bz2
Fix per-target dep calculation
For example `make show-downstream-deps-winpthreads` didn't show any deps even though i686-w64-mingw32.static target is set. Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5d6c275..dfca349 100644
--- a/Makefile
+++ b/Makefile
@@ -380,11 +380,12 @@ SET_CLEAR = \
WALK_UPSTREAM = \
$(strip \
$(foreach PKG,$(filter $(1),$(PKGS)),\
- $(foreach DEP,$($(PKG)_DEPS) $(foreach TARGET,$(MXE_TARGETS),$($(PKG)_DEPS_$(TARGET))),\
- $(if $(filter-out $(PKGS_VISITED),$(DEP)),\
- $(call SET_APPEND,PKGS_VISITED,$(DEP))\
- $(call WALK_UPSTREAM,$(DEP))\
- $(DEP)))))
+ $(foreach DEP,$($(PKG)_DEPS) $(foreach TARGET,$(MXE_TARGETS),\
+ $(value $(call LOOKUP_PKG_RULE,$(PKG),DEPS,$(TARGET)))),\
+ $(if $(filter-out $(PKGS_VISITED),$(DEP)),\
+ $(call SET_APPEND,PKGS_VISITED,$(DEP))\
+ $(call WALK_UPSTREAM,$(DEP))\
+ $(DEP)))))
# not really walking downstream - that seems to be quadratic, so take
# a linear approach and filter the fully expanded upstream for each pkg