Merge pull request #319 from kleetus/feature/use_bitcoins_openssl
Statically linking libcrypto and libssl from bitcoin instead of using…
This commit is contained in:
commit
439f863992
|
@ -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
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
],
|
||||
"conditions": [
|
||||
[
|
||||
"OS==\"mac\"",
|
||||
"OS==\"mac\"",
|
||||
{
|
||||
"xcode_settings": {
|
||||
"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
|
||||
|
@ -48,8 +48,8 @@
|
|||
"<!(./bin/variables.sh memenv)",
|
||||
"<!(./bin/variables.sh bdb)",
|
||||
"<!(./bin/variables.sh anl)",
|
||||
"-lssl",
|
||||
"-lcrypto"
|
||||
"<!(./bin/variables.sh ssl)",
|
||||
"<!(./bin/variables.sh crypto)"
|
||||
],
|
||||
"ldflags": [
|
||||
"<!(./bin/variables.sh load_archive)"
|
||||
|
|
Loading…
Reference in New Issue