From d10a762fb87cb676b289a5267cc586bd82df38ba Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 14 Apr 2018 08:51:29 -0600 Subject: [PATCH] Clean up libzcash CPPFLAGS, CXXFLAGS, and LDFLAGS By using the flags defined through ./configure instead, libzcash will react to configuration and build system changes (such as PIC_FLAGS being empty for Windows builds). --- src/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e3a4b60a0..b8e071bee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -527,11 +527,9 @@ libzcash_a_SOURCES = \ zcash/circuit/prfs.tcc \ zcash/circuit/utils.tcc -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 - -libzcash_a_LDFLAGS = $(SAN_LDFLAGS) $(HARDENED_LDFLAGS) +libzcash_a_CPPFLAGS = $(AM_CPPFLAGS) $(PIC_FLAGS) -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES) +libzcash_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libzcash_a_LDFLAGS = $(AM_LDFLAGS) libzcash_a_CPPFLAGS += -DMONTGOMERY_OUTPUT