Fixed whole-archive builds for the bindings binary.
This commit is contained in:
parent
2e19b44342
commit
bfc7ab8359
@ -27,8 +27,8 @@
|
|||||||
],
|
],
|
||||||
'link_settings': {
|
'link_settings': {
|
||||||
'libraries': [
|
'libraries': [
|
||||||
'<!(./platform/os.sh artifacts_dir)/lib/libboost_filesystem-mt.a',
|
'<!(./platform/os.sh filesystem)',
|
||||||
'<!(./platform/os.sh artifacts_dir)/lib/libboost_thread-mt.a',
|
'<!(./platform/os.sh thread)',
|
||||||
'<!(./platform/os.sh lib)'
|
'<!(./platform/os.sh lib)'
|
||||||
],
|
],
|
||||||
'ldflags': [
|
'ldflags': [
|
||||||
|
|||||||
@ -10,8 +10,6 @@ ext=so
|
|||||||
host=`uname -m`-`uname -a | awk '{print tolower($1)}'`
|
host=`uname -m`-`uname -a | awk '{print tolower($1)}'`
|
||||||
depends_dir="${BITCOIN_DIR}"/depends
|
depends_dir="${BITCOIN_DIR}"/depends
|
||||||
h_and_a_dir="${depends_dir}"/"${host}"
|
h_and_a_dir="${depends_dir}"/"${host}"
|
||||||
thread="${h_and_a_dir}"/lib/libboost_thread-mt.a
|
|
||||||
filesystem="${h_and_a_dir}"/lib/libboost_filesystem-mt.a
|
|
||||||
|
|
||||||
if test -f /etc/centos-release \
|
if test -f /etc/centos-release \
|
||||||
|| grep -q 'CentOS' /etc/redhat-release \
|
|| grep -q 'CentOS' /etc/redhat-release \
|
||||||
@ -52,6 +50,15 @@ fi
|
|||||||
|
|
||||||
os_dir=${root_dir}/platform/${os}
|
os_dir=${root_dir}/platform/${os}
|
||||||
|
|
||||||
|
if [ "${os}" == "osx" ]; then
|
||||||
|
artifacts_dir="${os_dir}/lib"
|
||||||
|
else
|
||||||
|
artifacts_dir="${os_dir}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
thread="${artifacts_dir}"/lib/libboost_thread-mt.a
|
||||||
|
filesystem="${artifacts_dir}"/lib/libboost_filesystem-mt.a
|
||||||
|
|
||||||
if test -z "$os" -o x"$os" = x'android' -o x"$os" = x'aix'; then
|
if test -z "$os" -o x"$os" = x'android' -o x"$os" = x'aix'; then
|
||||||
if test "$os" = 'android' -o "$os" = 'aix'; then
|
if test "$os" = 'android' -o "$os" = 'aix'; then
|
||||||
echo 'Android or AIX detected!' >& 2
|
echo 'Android or AIX detected!' >& 2
|
||||||
@ -103,11 +110,7 @@ if test -z "$1" -o x"$1" = x'load_archive'; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$1" -o x"$1" = x'artifacts_dir'; then
|
if test -z "$1" -o x"$1" = x'artifacts_dir'; then
|
||||||
if [ "${os}" == "osx" ]; then
|
echo -n "${artifacts_dir}"
|
||||||
echo -n "${os_dir}/lib"
|
|
||||||
else
|
|
||||||
echo -n "${os_dir}"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$1" -o x"$1" = x'lib'; then
|
if test -z "$1" -o x"$1" = x'lib'; then
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user