build: Use _FOR_BUILD suffix for tools to build native packages

hebasto · hebasto · commit 28725337e601 · 2021-12-21T02:01:48.000+02:00
diff --git a/depends/README.md b/depends/README.md
@@ -111,7 +111,9 @@ The following can be set when running make: `make FOO=bar`
 - `BUILD_ID_SALT`: Optional salt to use when generating build package ids
 - `FORCE_USE_SYSTEM_CLANG`: (EXPERTS ONLY) When cross-compiling for macOS, use Clang found in the
   system's `$PATH` rather than the default prebuilt release of Clang
-  from llvm.org. Clang 8 or later is required.
+  from llvm.org. Clang 8 or later is required
+- `{CC,CXX,...}_FOR_BUILD`: Build native packages with specified tools when
+  a package build script allows it
 
 If some packages are not built, for example `make NO_WALLET=1`, the appropriate
 options will be passed to bitcoin's configure. In this case, `--disable-wallet`.
diff --git a/depends/builders/default.mk b/depends/builders/default.mk
@@ -8,9 +8,9 @@ default_build_OTOOL = otool
 default_build_INSTALL_NAME_TOOL = install_name_tool
 
 define add_build_tool_func
-ifeq ($(filter $(origin $1),undefined default),)
-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))
+ifneq ($(origin $(1)_FOR_BUILD),undefined)
+build_$(build_os)_$1 = $(or $($(1)_FOR_BUILD),$(build_$(build_os)_$1),$(default_build_$1))
+build_$(build_arch)_$(build_os)_$1 = $(or $($(1)_FOR_BUILD),$(build_$(build_arch)_$(build_os)_$1),$$(build_$(build_os)_$1))
 else
 build_$(build_os)_$1 ?= $$(default_build_$1)
 build_$(build_arch)_$(build_os)_$1 ?= $$(build_$(build_os)_$1)
