Merge remote-tracking branch 'james/dev' into cryptoconditions

This commit is contained in:
Scott Sadler
2018-04-03 14:43:19 -03:00
4 changed files with 20 additions and 6 deletions

View File

@@ -3,9 +3,9 @@ rust_packages := rust librustzcash
proton_packages := proton
zcash_packages := libgmp libsodium
ifeq ($(host_os),linux)
packages := boost openssl libevent zeromq $(zcash_packages) googletest # googlemock
packages := boost openssl libevent zeromq $(zcash_packages) googletest #googlemock
else
packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest # googlemock
packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock
endif
native_packages := native_ccache