From d17a7f9618c960288cb39600cf765da79f5dcfe0 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Wed, 27 May 2020 20:21:11 -0700 Subject: [PATCH] fix mac build --- src/Makefile.am | 8 -------- zcutil/build-mac.sh | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f0db3bcc9..efc4b6e0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,15 +47,7 @@ BITCOIN_INCLUDES += -I$(srcdir)/snark BITCOIN_INCLUDES += -I$(srcdir)/snark/libsnark BITCOIN_INCLUDES += -I$(srcdir)/univalue/include -if TARGET_WINDOWS -LIBBITCOIN_SERVER=libbitcoin_server.a -lcurl -endif -if TARGET_DARWIN LIBBITCOIN_SERVER=libbitcoin_server.a -lcurl -else -LIBBITCOIN_SERVER=libbitcoin_server.a -lcurl -endif - LIBBITCOIN_WALLET=libbitcoin_wallet.a LIBBITCOIN_COMMON=libbitcoin_common.a LIBBITCOIN_CLI=libbitcoin_cli.a diff --git a/zcutil/build-mac.sh b/zcutil/build-mac.sh index 832b32714..f255cee2b 100755 --- a/zcutil/build-mac.sh +++ b/zcutil/build-mac.sh @@ -44,7 +44,7 @@ make "$@" -C ./depends/ V=1 NO_QT=1 NO_PROTON=1 ./autogen.sh CPPFLAGS="-I$PREFIX/include -arch x86_64" LDFLAGS="-L$PREFIX/lib -arch x86_64 -Wl,-no_pie -g" \ -CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc\@8/8.4.0_1/include/c++/8.4.0/ -I$PREFIX/include -I$PREFIX/lib -fwrapv -fno-strict-aliasing -Werror -g -Wl,-undefined -Wl,dynamic_lookup -g' \ +CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc\@8/8.4.0_1/include/c++/8.4.0/ -I$PREFIX/include -fwrapv -fno-strict-aliasing -Wno-builtin-declaration-mismatch -Werror -g -Wl,-undefined -Wl,dynamic_lookup' \ ./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" make "$@" V=1 NO_GTEST=1 STATIC=1