BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Made mac-specific build changes included by a configure flag as a temporary measure.

This commit is contained in:
Don Shin 2018-07-23 22:04:40 -05:00
parent 298002424d
commit f01af43fa4
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -199,6 +199,17 @@ if test "x$use_asm" = xyes; then
AC_DEFINE(USE_ASM, 1, [Define this symbol to build in assembly routines])
fi
dnl Temporary flag to get compilation on Mac working without interrupting Linux values
AC_ARG_ENABLE([mac-build-script],
[AS_HELP_STRING([--mac-build-script],
[Enable mac-specific compilation values (default is no)])],
[mac_build_script=$enableval],
[mac_build_script=no])
AM_CONDITIONAL([MAC_BUILD_SCRIPT],[test x$mac_build_script = xyes])
if test "x$mac_build_script" = xyes; then
AC_DEFINE(MAC_BUILD_SCRIPT, 1, [Define this symbol to use mac-specific build values])
fi
AC_ARG_WITH([system-univalue],
[AS_HELP_STRING([--with-system-univalue],
[Build with system UniValue (default is no)])],

2
scripts/build-mac.sh
View File

@ -108,5 +108,5 @@ CPPFLAGS+="-Xpreprocessor -fopenmp -lomp -L/usr/local/opt/libomp/lib -I/usr/loca
HOST="$HOST" BUILD="$BUILD" "$MAKE" "$@" -C ./depends/ V=1
./autogen.sh
./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" $CONFIGURE_FLAGS CXXFLAGS='-g' CPPFLAGS="${CPPFLAGS}"
./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" $CONFIGURE_FLAGS CXXFLAGS='-g' CPPFLAGS="${CPPFLAGS}" --enable-mac-build-script=yes
"$MAKE" "$@" V=1

23
src/Makefile.am
View File

@ -548,7 +548,15 @@ libzcash_a_SOURCES = \
zcash/circuit/prfs.tcc \
zcash/circuit/utils.tcc
libzcash_a_CPPFLAGS = -DMULTICORE -Xpreprocessor -fopenmp -lomp -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 = -DMULTICORE
if MAC_BUILD_SCRIPT
libzcash_a_CPPFLAGS += -Xpreprocessor -fopenmp -lomp
else
libzcash_a_CPPFLAGS += fopenmp
endif
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
@ -566,9 +574,18 @@ if GLIBC_BACK_COMPAT
endif
libbitcoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
libbitcoinconsensus_la_LIBADD = $(LIBSECP256K1) $(LIBZCASH)
libbitcoinconsensus_la_LIBADD = $(LIBSECP256K1)
if MAC_BUILD_SCRIPT
libbitcoinconsensus_la_LIBADD += $(LIBZCASH)
endif
libbitcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL
libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -lsodium
libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
if MAC_BUILD_SCRIPT
libbitcoinconsensus_la_CXXFLAGS += -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -lsodium
endif
endif
#