aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2013-01-30 16:19:54 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2013-02-19 05:32:39 +0000
commit3a9c2d51e12fcf321daa78303e38c725b6477b66 (patch)
tree64d5ccfcde76fa25b68154865710d5742ab3b11e
parent7e2d850b123798992b4d3c18193251d6232bd7cc (diff)
downloadbitcoin-3a9c2d51e12fcf321daa78303e38c725b6477b66.tar.xz
Bugfix: makefile.unix: Honour BOOST_LIB_SUFFIX on boost_unit_test_framework
-rw-r--r--src/makefile.unix6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/makefile.unix b/src/makefile.unix
index ece2f59cf5..1dd44b2eeb 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