Skip to content

Commit

Permalink
ZEC: better chain dependency handling
Browse files Browse the repository at this point in the history
Use script from ZCash to determine host quadruplet to avoid fixed string
and disable ZCash tests to make building faster.
  • Loading branch information
Hanjiang Yu committed Apr 22, 2019
1 parent bbc866e commit feabc43
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions CMakeLists.txt
Expand Up @@ -246,14 +246,18 @@ if(CHAIN_TYPE STREQUAL "BCH")
"${CHAIN_SRC_ROOT}/src/crypto/libbitcoin_crypto_sse41.a")

elseif(CHAIN_TYPE STREQUAL "ZEC")
execute_process(
COMMAND "${CHAIN_SRC_ROOT}/depends/config.guess"
OUTPUT_VARIABLE ZCASH_PLATFORM
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(BITCOIN_LIBRARIES
"${CHAIN_SRC_ROOT}/src/libbitcoin_common.a"
"${CHAIN_SRC_ROOT}/src/libbitcoin_util.a"
"${CHAIN_SRC_ROOT}/src/libzcash.a"
"${CHAIN_SRC_ROOT}/src/crypto/libbitcoin_crypto.a"
"${CHAIN_SRC_ROOT}/src/snark/libsnark.a"
"${CHAIN_SRC_ROOT}/depends/x86_64-unknown-linux-gnu/lib/libsodium.a"
"${CHAIN_SRC_ROOT}/depends/x86_64-unknown-linux-gnu/lib/librustzcash.a")
"${CHAIN_SRC_ROOT}/depends/${ZCASH_PLATFORM}/lib/libsodium.a"
"${CHAIN_SRC_ROOT}/depends/${ZCASH_PLATFORM}/lib/librustzcash.a")

else()
set(BITCOIN_LIBRARIES ${BITCOIN_LIBRARIES}
Expand All @@ -268,7 +272,7 @@ if (NOT EXISTS ${BITCOIN_LIBRARIE})
message(STATUS "building ${CHAIN_NAME}...")

if(CHAIN_TYPE STREQUAL "ZEC")
execute_process(WORKING_DIRECTORY "${CHAIN_SRC_ROOT}" COMMAND ./zcutil/build.sh ${MAKE_JOBS})
execute_process(WORKING_DIRECTORY "${CHAIN_SRC_ROOT}" COMMAND ./zcutil/build.sh --disable-tests ${MAKE_JOBS})

else()
execute_process(WORKING_DIRECTORY "${CHAIN_SRC_ROOT}" COMMAND ./autogen.sh)
Expand Down

0 comments on commit feabc43

Please sign in to comment.