From fd7c139e37ee4c6af924e6352f6ca56a4b861e56 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Wed, 25 May 2016 15:59:59 -0600 Subject: [PATCH] Pass `-fopenmp` at compile-time to enable MULTICORE. --- src/Makefile.am | 2 +- src/Makefile.gtest.include | 2 +- src/Makefile.test.include | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8bd9ff9ad..f4613c27c 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 = -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) +libzcash_a_CPPFLAGS = -DMULTICORE -fopenmp -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 2b3f64447..690f0dab7 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 = -DMULTICORE -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC +zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -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) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 5719e512d..910592e06 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -93,7 +93,7 @@ BITCOIN_TESTS += \ endif test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) -test_test_bitcoin_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) +test_test_bitcoin_CPPFLAGS = -fopenmp $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) if ENABLE_WALLET