diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-06-13 07:57:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-06-13 07:57:26 +0200 |
| commit | 65a9d7dcdcb2f82aec89191d76b4b8619b7cc369 (patch) | |
| tree | 67e6bc9f19f6e53c0d9c261ebdf70db38c8a3314 /depends/Makefile | |
| parent | 3e4cf8fe26440cae179aaca44ccadd476b464994 (diff) | |
| parent | 9d253620874087d96d64d0c4c771a582d9774657 (diff) | |
| download | bitcoin-65a9d7dcdcb2f82aec89191d76b4b8619b7cc369.tar.xz | |
Merge #8188: Add armhf/aarch64 gitian builds
9d25362 build: add armhf/aarch64 gitian builds (Cory Fields)
980e7eb depends: only build qt on linux for x86_64/x86 (Cory Fields)
Diffstat (limited to 'depends/Makefile')
| -rw-r--r-- | depends/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/depends/Makefile b/depends/Makefile index 3ddfc85a45..dedb0674cf 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -89,13 +89,17 @@ $(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) -qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) -qt_native_packages_$(NO_QT) = $(qt_native_packages) +qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) wallet_packages_$(NO_WALLET) = $(wallet_packages) upnp_packages_$(NO_UPNP) = $(upnp_packages) packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) -native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) $(qt_native_packages_) +native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) + +ifneq ($(qt_packages_),) +native_packages += $(qt_native_packages) +endif + all_packages = $(packages) $(native_packages) meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk |