From 7e078e58c16f46e924df418bda004f53e074db02 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 24 Jan 2020 05:48:43 -0500 Subject: [PATCH] Remove more libsnark stuff from the build system --- src/Makefile.am | 12 ------------ src/Makefile.zcash.include | 1 - 2 files changed, 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c9f7cdc4d..25f48a557 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,15 +65,6 @@ endif $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O2 -march=x86-64 -g " -LIBSNARK_CXXFLAGS = $(AM_CXXFLAGS) $(PIC_FLAGS) -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 -fstack-protector-all -LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1 -if HAVE_OPENMP -LIBSNARK_CONFIG_FLAGS += MULTICORE=1 -endif -if TARGET_DARWIN -LIBSNARK_CONFIG_FLAGS += PLATFORM=darwin -endif - $(LIBUNIVALUE): $(wildcard univalue/lib/*) $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O2 -march=x86-64 -g " @@ -520,7 +511,6 @@ komodod_LDADD = \ $(LIBBITCOIN_PROTON) \ $(LIBBITCOIN_CRYPTO) \ $(LIBZCASH) \ - $(LIBSNARK) \ $(LIBLEVELDB) \ $(LIBMEMENV) \ $(LIBSECP256K1) \ @@ -605,7 +595,6 @@ wallet_utility_LDADD = \ $(BDB_LIBS) \ $(CRYPTO_LIBS) \ $(LIBZCASH) \ - $(LIBSNARK) \ $(LIBZCASH_LIBS)\ $(LIBCRYPTOCONDITIONS) endif @@ -627,7 +616,6 @@ komodo_tx_LDADD = \ $(LIBBITCOIN_UTIL) \ $(LIBSECP256K1) \ $(LIBZCASH) \ - $(LIBSNARK) \ $(LIBBITCOIN_CRYPTO) \ $(LIBZCASH_LIBS) \ $(LIBCRYPTOCONDITIONS) diff --git a/src/Makefile.zcash.include b/src/Makefile.zcash.include index 0eb4582c1..c77fe121c 100644 --- a/src/Makefile.zcash.include +++ b/src/Makefile.zcash.include @@ -20,7 +20,6 @@ zcash_CreateJoinSplit_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) zcash_CreateJoinSplit_LDADD = \ $(LIBBITCOIN_COMMON) \ $(LIBZCASH) \ - $(LIBSNARK) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CRYPTO) \ $(BOOST_LIBS) \