build: Propagate user-defined tools to native packages

hebasto · hebasto · commit 557d4d5d7421 · 2021-11-22T12:57:50.000+02:00
diff --git a/depends/builders/default.mk b/depends/builders/default.mk
@@ -8,11 +8,17 @@ default_build_OTOOL = otool
 default_build_INSTALL_NAME_TOOL = install_name_tool
 
 define add_build_tool_func
+ifneq ($(filter $(origin $1),undefined default),)
 build_$(build_os)_$1 ?= $$(default_build_$1)
 build_$(build_arch)_$(build_os)_$1 ?= $$(build_$(build_os)_$1)
-build_$1=$$(build_$(build_arch)_$(build_os)_$1)
+else
+build_$(build_os)_$1 = $(or $($1),$(build_$(build_os)_$1),$(default_build_$1))
+build_$(build_arch)_$(build_os)_$1 = $(or $($1),$(build_$(build_arch)_$(build_os)_$1),$$(build_$(build_os)_$1))
+endif
+build_$1 = $$(build_$(build_arch)_$(build_os)_$1)
 endef
 $(foreach var,CC CXX AR RANLIB NM STRIP SHA256SUM DOWNLOAD OTOOL INSTALL_NAME_TOOL,$(eval $(call add_build_tool_func,$(var))))
+
 define add_build_flags_func
 build_$(build_arch)_$(build_os)_$1 += $(build_$(build_os)_$1)
 build_$1=$$(build_$(build_arch)_$(build_os)_$1)
