Browse Source

Put mac specific changes into mac specific files.

Update mac build instructions.
pull/105/head
FireMartZ 6 years ago
parent
commit
72d3b53970
  1. 2
      INSTALL.md
  2. 4
      depends/packages/packages.mk
  3. 12
      zcutil/build-mac.sh

2
INSTALL.md

@ -120,7 +120,7 @@ cd hush
# fetch key
./zcutil/fetch-params.sh
# Build
./zcutil/build-mac.sh --disable-rust
./zcutil/build-mac.sh
# Run a HUSH node
./src/hushd
```

4
depends/packages/packages.mk

@ -1,5 +1,5 @@
#rust_packages := rust librustzcash
#proton_packages := proton
rust_packages := rust librustzcash
proton_packages := proton
zcash_packages := libgmp libsodium
packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock
native_packages := native_ccache

12
zcutil/build-mac.sh

@ -51,14 +51,22 @@ then
shift
fi
# If --enable-proton is the next argument, enable building Proton code:
PROTON_ARG='--enable-proton=no'
if [ "x${1:-}" = 'x--enable-proton' ]
then
PROTON_ARG=''
shift
fi
TRIPLET=`./depends/config.guess`
PREFIX="$(pwd)/depends/$TRIPLET"
NO_RUST="$RUST_ARG" make "$@" -C ./depends/ V=1 NO_QT=1
NO_RUST="$RUST_ARG" NO_PROTON="$PROTON_ARG" make "$@" -C ./depends/ V=1 NO_QT=1
./autogen.sh
CPPFLAGS="-I$PREFIX/include -arch x86_64" LDFLAGS="-L$PREFIX/lib -arch x86_64 -Wl,-no_pie" \
CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc5/5.4.0/include/c++/5.4.0 -I$PREFIX/include -fwrapv -fno-strict-aliasing -Werror -g -Wl,-undefined -Wl,dynamic_lookup' \
./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" "$RUST_ARG" "$MINING_ARG"
./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" "$RUST_ARG" "$PROTON_ARG" "$MINING_ARG"
make "$@" V=1 NO_GTEST=0 STATIC=1
Loading…
Cancel
Save