diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2020-06-12 15:56:47 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2020-07-10 21:05:53 -0400 |
| commit | 156b604203ef17b2b77ee9dacf15e375c809242a (patch) | |
| tree | 9d3c67a2279afc118290477778567ce8ac923050 | |
| parent | c9c572a367f08095a3e2c7c0723da9f6778b9378 (diff) | |
| download | bitcoin-156b604203ef17b2b77ee9dacf15e375c809242a.tar.xz | |
depends: force a new host id string if FORCE_USE_SYSTEM_CLANG is in use
This should be caught by the differing clang --version outputs, but because we
haven't yet extracted our pinned clang, the system one is actually used for the
version check. That's not a problem because bumping our pinned clang will
cause a rebuild of everything anyway.
| -rw-r--r-- | depends/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/depends/Makefile b/depends/Makefile index 3ebc3cb6b9..2bc5df974a 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -125,6 +125,11 @@ $(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) +ifneq ($(strip $(FORCE_USE_SYSTEM_CLANG)),) +build_id_string+=system_clang +$(host_arch)_$(host_os)_id_string+=system_clang +endif + qrencode_packages_$(NO_QR) = $(qrencode_packages) qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_) |