From 3a9c2d51e12fcf321daa78303e38c725b6477b66 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 30 Jan 2013 16:19:54 +0000 Subject: [PATCH] Bugfix: makefile.unix: Honour BOOST_LIB_SUFFIX on boost_unit_test_framework --- src/makefile.unix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/makefile.unix b/src/makefile.unix index ece2f59cf..1dd44b2ee 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -36,6 +36,10 @@ LIBS += \ -l ssl \ -l crypto +TESTLIBS += \ + -Wl,-B$(LMODE) \ + -l boost_unit_test_framework$(BOOST_LIB_SUFFIX) + ifndef USE_UPNP override USE_UPNP = - endif @@ -179,7 +183,7 @@ obj-test/%.o: test/%.cpp rm -f $(@:%.o=%.d) test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS) + $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS) clean: -rm -f bitcoind test_bitcoin