Browse Source
Only set multicore flags if OpenMP is available
pull/4/head
Jack Grigg
7 years ago
No known key found for this signature in database
GPG Key ID: 665DBCD284F7DAFF
4 changed files with
4 additions and
3 deletions
-
configure.ac
-
src/Makefile.am
-
src/Makefile.gtest.include
-
src/Makefile.test.include
|
|
|
@ -743,6 +743,7 @@ dnl Check for OpenMP support |
|
|
|
AX_OPENMP( |
|
|
|
[AC_DEFINE(HAVE_OPENMP, 1, [Define if OpenMP is enabled]) |
|
|
|
AM_CONDITIONAL([HAVE_OPENMP], [true]) |
|
|
|
CPPFLAGS="$CPPFLAGS -DMULTICORE" |
|
|
|
CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"], |
|
|
|
[AC_MSG_WARN([OpenMP not supported, disabling multithreading]) |
|
|
|
AC_DEFINE(HAVE_OPENMP, 0, [Define if OpenMP is enabled]) |
|
|
|
|
|
|
|
@ -525,7 +525,7 @@ libzcash_a_SOURCES = \ |
|
|
|
zcash/circuit/prfs.tcc \
|
|
|
|
zcash/circuit/utils.tcc |
|
|
|
|
|
|
|
libzcash_a_CPPFLAGS = -DMULTICORE -fopenmp -fPIC -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS $(HARDENED_CPPFLAGS) $(HARDENED_CXXFLAGS) $(HARDENED_LDFLAGS) -pipe $(SAN_LDFLAGS) -O1 -g -Wstack-protector $(SAN_CXXFLAGS) -fstack-protector-all -fPIE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES) |
|
|
|
libzcash_a_CPPFLAGS = -fPIC -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS $(HARDENED_CPPFLAGS) $(HARDENED_CXXFLAGS) $(HARDENED_LDFLAGS) -pipe $(SAN_LDFLAGS) -O1 -g -Wstack-protector $(SAN_CXXFLAGS) -fstack-protector-all -fPIE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES) |
|
|
|
|
|
|
|
libzcash_a_CXXFLAGS = $(SAN_CXXFLAGS) $(HARDENED_CXXFLAGS) -fwrapv -fno-strict-aliasing |
|
|
|
|
|
|
|
|
|
|
|
@ -46,7 +46,7 @@ zcash_gtest_SOURCES += \ |
|
|
|
wallet/gtest/test_wallet.cpp |
|
|
|
endif |
|
|
|
|
|
|
|
zcash_gtest_CPPFLAGS = $(AM_CPPFLAGS) -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC $(BITCOIN_INCLUDES) |
|
|
|
zcash_gtest_CPPFLAGS = $(AM_CPPFLAGS) -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC $(BITCOIN_INCLUDES) |
|
|
|
zcash_gtest_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) |
|
|
|
|
|
|
|
zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
|
|
|
|
|
|
|
|
@ -99,7 +99,7 @@ BITCOIN_TESTS += \ |
|
|
|
endif |
|
|
|
|
|
|
|
test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) |
|
|
|
test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) -fopenmp $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS) |
|
|
|
test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS) |
|
|
|
test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
|
|
|
|
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) |
|
|
|
test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) |
|
|
|
|
