diff options
Diffstat (limited to 'contrib/depends/funcs.mk')
| -rw-r--r-- | contrib/depends/funcs.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk index 757c941..3bc7d79 100644 --- a/contrib/depends/funcs.mk +++ b/contrib/depends/funcs.mk @@ -44,7 +44,7 @@ define int_get_build_id $(eval $(1)_dependencies += $($(1)_$(host_arch)_$(host_os)_dependencies) $($(1)_$(host_os)_dependencies)) $(eval $(1)_all_dependencies:=$(call int_get_all_dependencies,$(1),$($($(1)_type)_native_toolchain) $($(1)_dependencies))) $(foreach dep,$($(1)_all_dependencies),$(eval $(1)_build_id_deps+=$(dep)-$($(dep)_version)-$($(dep)_recipe_hash))) -$(eval $(1)_build_id_long:=$(1)-$($(1)_version)-$($(1)_recipe_hash)-$(release_type) $($(1)_build_id_deps) $($($(1)_type)_id_string)) +$(eval $(1)_build_id_long:=$(shell uname -sm)-$(1)-$($(1)_version)-$($(1)_recipe_hash)-$(release_type) $($(1)_build_id_deps) $($($(1)_type)_id_string)) $(eval $(1)_build_id:=$(shell echo -n "$($(1)_build_id_long)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH))) $(eval $(1)_build_id_long_legacy:=$(1)-$($(1)_version)-$($(1)_recipe_hash)-$(release_type) $($(1)_build_id_deps) $($($(1)_type)_id_string_legacy)) $(eval $(1)_build_id_legacy:=$(shell echo -n "$($(1)_build_id_long_legacy)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH))) @@ -202,7 +202,7 @@ $(1)_autoconf += LDFLAGS="$$($(1)_ldflags)" endif endef -COMPRESS_CMD := $(shell if command -v pigz >/dev/null 2>&1; then echo "pigz"; else echo "gzip"; fi) +COMPRESS_CMD := $(shell if command -v pigz >/dev/null 2>&1; then which pigz; else which gzip; fi) define int_add_cmds $($(1)_fetched): |