From 132821523ba654ad2260a41681cc6f0bad76ba71 Mon Sep 17 00:00:00 2001 From: Chris Kleeschulte Date: Fri, 16 Oct 2015 14:17:00 -0400 Subject: [PATCH] Statically linking libcrypto and libssl from bitcoin instead of using the System's version. --- bin/variables.sh | 10 ++++++++++ binding.gyp | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bin/variables.sh b/bin/variables.sh index b59a1476..aa986fb4 100755 --- a/bin/variables.sh +++ b/bin/variables.sh @@ -32,6 +32,8 @@ system="${cache_dir}"/depends/"${host}"/lib/libboost_system-mt.a leveldb="${cache_dir}"/src/leveldb/libleveldb.a memenv="${cache_dir}"/src/leveldb/libmemenv.a libsecp256k1="${cache_dir}"/src/secp256k1/.libs/libsecp256k1.a +ssl="${cache_dir}"/depends/"${host}"/lib/libssl.a +crypto="${cache_dir}"/depends/"${host}"/lib/libcrypto.a if test x"$1" = x'anl'; then if [ "${platform}" != "darwin" ]; then @@ -63,6 +65,14 @@ if test -z "$1" -o x"$1" = x'system'; then echo -n "${system}" fi +if test -z "$1" -o x"$1" = x'ssl'; then + echo -n "${ssl}" +fi + +if test -z "$1" -o x"$1" = x'crypto'; then + echo -n "${crypto}" +fi + if test -z "$1" -o x"$1" = x'chrono'; then echo -n "${chrono}" fi diff --git a/binding.gyp b/binding.gyp index e7a8ebb5..99a5cab0 100644 --- a/binding.gyp +++ b/binding.gyp @@ -13,7 +13,7 @@ ], "conditions": [ [ - "OS==\"mac\"", + "OS==\"mac\"", { "xcode_settings": { "GCC_ENABLE_CPP_EXCEPTIONS": "YES", @@ -48,8 +48,8 @@ "