d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile: enable target-specific, order-only deps lookup 

Turns out there are cases when we don't want the default
AUTOTOOLS|CMAKE native builds to run - essentially `make gcc`
which can use `zstd` on v10+
This commit is contained in:
Tony Theodore 2020-06-10 00:04:52 +10:00
parent 1ee37f8e0a
commit 4ccfdfc560
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -507,9 +507,9 @@ PKG_DEPS = \
$(filter $($($(DEP)_PKG)_TYPE),$(BUILD_PKG_TYPES))), \
$($(DEP)_TGT)/installed/$($(DEP)_PKG))))
# order-only package deps unlikely to need target lookup
# order-only package deps - needs target lookup for e.g. zstd native case
PKG_OO_DEPS = \
$(foreach DEP,$($(PKG)_OO_DEPS), \
$(foreach DEP,$(value $(call LOOKUP_PKG_RULE,$(PKG),OO_DEPS,$(TARGET))), \
$(if $(filter $(DEP),$(PKGS)), \
$(if $(or $(value $(call LOOKUP_PKG_RULE,$(DEP),BUILD,$(TARGET))), \
$(filter $($(DEP)_TYPE),$(BUILD_PKG_TYPES))), \
@ -569,7 +569,7 @@ $(foreach TARGET,$(MXE_TARGETS),\
$(eval $(TARGET)_UC_LIB_TYPE := $(if $(findstring shared,$(TARGET)),SHARED,STATIC)))
# finds a package rule defintion
RULE_TYPES := BUILD DEPS FILE MESSAGE URL
RULE_TYPES := BUILD DEPS FILE MESSAGE OO_DEPS URL
# by truncating the target elements then looking for STAIC|SHARED rules:
#
# foo_BUILD_i686-w64-mingw32.static.win32.dw2