From bfc7ab835929790b03f4f924a40d1eb0ed173190 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Wed, 29 Jul 2015 17:06:40 -0400
Subject: [PATCH] Fixed whole-archive builds for the bindings binary.

---
 binding.gyp    |  4 ++--
 platform/os.sh | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 2fd9e15f..08a19576 100755
--- a/binding.gyp
+++ b/binding.gyp
@@ -27,8 +27,8 @@
     ],
     'link_settings': {
       'libraries': [
-        '<!(./platform/os.sh artifacts_dir)/lib/libboost_filesystem-mt.a',
-        '<!(./platform/os.sh artifacts_dir)/lib/libboost_thread-mt.a',
+        '<!(./platform/os.sh filesystem)',
+        '<!(./platform/os.sh thread)',
         '<!(./platform/os.sh lib)'
       ],
       'ldflags': [
diff --git a/platform/os.sh b/platform/os.sh
index cb48f411..b1897183 100755
--- a/platform/os.sh
+++ b/platform/os.sh
@@ -10,8 +10,6 @@ ext=so
 host=`uname -m`-`uname -a | awk '{print tolower($1)}'`
 depends_dir="${BITCOIN_DIR}"/depends
 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 \
   || grep -q 'CentOS' /etc/redhat-release \
@@ -52,6 +50,15 @@ fi
 
 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 "$os" = 'android' -o "$os" = 'aix'; then
     echo 'Android or AIX detected!' >& 2
@@ -103,11 +110,7 @@ if test -z "$1" -o x"$1" = x'load_archive'; then
 fi
 
 if test -z "$1" -o x"$1" = x'artifacts_dir'; then
-  if [ "${os}"  == "osx" ]; then
-    echo -n "${os_dir}/lib"
-  else
-    echo -n "${os_dir}"
-  fi
+  echo -n "${artifacts_dir}" 
 fi
 
 if test -z "$1" -o x"$1" = x'lib'; then