aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-05-09 09:56:58 -0400
committerGavin Andresen <gavinandresen@gmail.com>2013-05-09 17:08:38 -0400
commit4332be71a2b15315ddc299e2f3695054df30eb95 (patch)
tree5ac3a1678d688d3c364f3de1f54088180176ecae
parente5ddaf5ec8ae703818dcdcf28c7dd6e001b6d681 (diff)
Link with boost_chrono library on OSX
Compiling on my OSX 10.6 build machine, I get: Undefined symbols: "boost::chrono::steady_clock::now()", referenced from: boost::cv_status boost::condition_variable::wait_for<long long, boost::ratio<1ll, 1000000000ll> >(boost::unique_lock<boost::mutex>&, boost::chrono::duration<long long, boost::ratio<1ll, 1000000000ll> > const&)in bitcoinrpc.o Linking against the boost_chrono fixes the issue. Windows builds already link against boost_chrono; Linux doesn't, but compiles (on pull-tester / gitian, at least).
-rw-r--r--bitcoin-qt.pro1
-rw-r--r--src/makefile.osx2
2 files changed, 3 insertions, 0 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index d938c07c45..07eadb5db9 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -411,6 +411,7 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
contains(RELEASE, 1) {
!win32:!macx {
diff --git a/src/makefile.osx b/src/makefile.osx
index af12731fa4..50279fdb05 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -36,6 +36,7 @@ LIBS += \
$(DEPSDIR)/lib/libboost_filesystem-mt.a \
$(DEPSDIR)/lib/libboost_program_options-mt.a \
$(DEPSDIR)/lib/libboost_thread-mt.a \
+ $(DEPSDIR)/lib/libboost_chrono-mt.a \
$(DEPSDIR)/lib/libssl.a \
$(DEPSDIR)/lib/libcrypto.a \
-lz
@@ -48,6 +49,7 @@ LIBS += \
-lboost_filesystem-mt \
-lboost_program_options-mt \
-lboost_thread-mt \
+ -lboost_chrono-mt \
-lssl \
-lcrypto \
-lz