diff --git a/configure.ac b/configure.ac index 5453418a7..5d062a1b5 100644 --- a/configure.ac +++ b/configure.ac @@ -714,7 +714,7 @@ CPPFLAGS="-I$LIBSNARK_INCDIR $CPPFLAGS" AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing)) AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx]) -LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium" +LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp" AC_CHECK_LIB([crypto],[RAND_egd],[],[ AC_ARG_WITH([libressl], diff --git a/depends/packages/libsnark.mk b/depends/packages/libsnark.mk index d40956b78..57436e46f 100644 --- a/depends/packages/libsnark.mk +++ b/depends/packages/libsnark.mk @@ -15,7 +15,7 @@ define $(package)_preprocess_cmds endef define $(package)_build_cmds - CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 + CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 endef define $(package)_stage_cmds diff --git a/src/Makefile.am b/src/Makefile.am index 8ce0c47e7..8bd9ff9ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -416,7 +416,7 @@ libzcash_a_SOURCES = \ zcash/prf.cpp \ zcash/util.cpp -libzcash_a_CPPFLAGS = -fPIC -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS $(HARDENED_CPPFLAGS) -pipe -O2 -O0 -g -Wstack-protector -fstack-protector-all -fPIE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES) +libzcash_a_CPPFLAGS = -DMULTICORE -fPIC -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS $(HARDENED_CPPFLAGS) -pipe -O2 -O0 -g -Wstack-protector -fstack-protector-all -fPIE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES) # bitcoinconsensus library # if BUILD_BITCOIN_LIBS diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include index aed865a7c..2b3f64447 100644 --- a/src/Makefile.gtest.include +++ b/src/Makefile.gtest.include @@ -11,7 +11,7 @@ zcash_gtest_SOURCES = \ gtest/test_merkletree.cpp \ gtest/test_circuit.cpp -zcash_gtest_CPPFLAGS = -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC +zcash_gtest_CPPFLAGS = -DMULTICORE -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC zcash_gtest_LDADD = -lgtest $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1)