diff options
Diffstat (limited to 'contrib/depends/Makefile')
| -rw-r--r-- | contrib/depends/Makefile | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/contrib/depends/Makefile b/contrib/depends/Makefile index dd357c8..3efa8b0 100644 --- a/contrib/depends/Makefile +++ b/contrib/depends/Makefile @@ -110,19 +110,35 @@ include builders/$(build_os).mk include builders/default.mk include packages/packages.mk +# Legacy build ID strings (kept for debugging info) +build_id_string_legacy:=$(BUILD_ID_SALT) +build_id_string_legacy+=$(shell $(build_CC) --version 2>/dev/null) +build_id_string_legacy+=$(shell $(build_AR) --version 2>/dev/null) +build_id_string_legacy+=$(shell $(build_CXX) --version 2>/dev/null) +build_id_string_legacy+=$(shell $(build_RANLIB) --version 2>/dev/null) +build_id_string_legacy+=$(shell $(build_STRIP) --version 2>/dev/null) + +$(host_arch)_$(host_os)_id_string_legacy:=$(HOST_ID_SALT) +$(host_arch)_$(host_os)_id_string_legacy+=$(shell $(host_CC) --version 2>/dev/null) +$(host_arch)_$(host_os)_id_string_legacy+=$(shell $(host_AR) --version 2>/dev/null) +$(host_arch)_$(host_os)_id_string_legacy+=$(shell $(host_CXX) --version 2>/dev/null) +$(host_arch)_$(host_os)_id_string_legacy+=$(shell $(host_RANLIB) --version 2>/dev/null) +$(host_arch)_$(host_os)_id_string_legacy+=$(shell $(host_STRIP) --version 2>/dev/null) + +# Simplified build ID strings (more portable) build_id_string:=$(BUILD_ID_SALT) -build_id_string+=$(shell $(build_CC) --version 2>/dev/null) -build_id_string+=$(shell $(build_AR) --version 2>/dev/null) -build_id_string+=$(shell $(build_CXX) --version 2>/dev/null) -build_id_string+=$(shell $(build_RANLIB) --version 2>/dev/null) -build_id_string+=$(shell $(build_STRIP) --version 2>/dev/null) +build_id_string+=$(shell basename $(build_CC) 2>/dev/null || echo "unknown") +build_id_string+=$(shell basename $(build_AR) 2>/dev/null || echo "unknown") +build_id_string+=$(shell basename $(build_CXX) 2>/dev/null || echo "unknown") +build_id_string+=$(shell basename $(build_RANLIB) 2>/dev/null || echo "unknown") +build_id_string+=$(shell basename $(build_STRIP) 2>/dev/null || echo "unknown") $(host_arch)_$(host_os)_id_string:=$(HOST_ID_SALT) -$(host_arch)_$(host_os)_id_string+=$(shell $(host_CC) --version 2>/dev/null) -$(host_arch)_$(host_os)_id_string+=$(shell $(host_AR) --version 2>/dev/null) -$(host_arch)_$(host_os)_id_string+=$(shell $(host_CXX) --version 2>/dev/null) -$(host_arch)_$(host_os)_id_string+=$(shell $(host_RANLIB) --version 2>/dev/null) -$(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null) +$(host_arch)_$(host_os)_id_string+=$(shell basename $(host_CC) 2>/dev/null || echo "unknown") +$(host_arch)_$(host_os)_id_string+=$(shell basename $(host_AR) 2>/dev/null || echo "unknown") +$(host_arch)_$(host_os)_id_string+=$(shell basename $(host_CXX) 2>/dev/null || echo "unknown") +$(host_arch)_$(host_os)_id_string+=$(shell basename $(host_RANLIB) 2>/dev/null || echo "unknown") +$(host_arch)_$(host_os)_id_string+=$(shell basename $(host_STRIP) 2>/dev/null || echo "unknown") packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) @@ -204,8 +220,8 @@ $(host_prefix)/share/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_ define check_or_remove_cached mkdir -p $(BASE_CACHE)/$(host)/$(package) && cd $(BASE_CACHE)/$(host)/$(package); \ $(build_SHA256SUM) -c $($(package)_cached_checksum) >/dev/null 2>/dev/null || \ - ( rm -f $($(package)_cached_checksum); \ - if test -f "$($(package)_cached)"; then echo "Checksum mismatch for $(package). Forcing rebuild.."; rm -f $($(package)_cached_checksum) $($(package)_cached); fi ) + ( rm -f $($(package)_cached_checksum) $($(package)_cached_buildinfo); \ + if test -f "$($(package)_cached)"; then echo "Checksum mismatch for $(package). Forcing rebuild.."; rm -f $($(package)_cached_checksum) $($(package)_cached) $($(package)_cached_buildinfo); fi ) endef define check_or_remove_sources |