diff options
| author | Gavin Andresen <[email protected]> | 2013-04-08 18:03:03 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-04-08 18:03:03 -0700 |
| commit | f49992d983d2202f1e8210e86201b6741726dd88 (patch) | |
| tree | 389a23bce1d4ed207cb53576e31aee5b323550ca /src/makefile.unix | |
| parent | Merge pull request #2470 from Diapolo/progressbarlabel (diff) | |
| parent | Bugfix: makefile.unix: Honour BOOST_LIB_SUFFIX on boost_unit_test_framework (diff) | |
| download | discoin-f49992d983d2202f1e8210e86201b6741726dd88.tar.xz discoin-f49992d983d2202f1e8210e86201b6741726dd88.zip | |
Merge pull request #2243 from luke-jr/bugfix_leveldb
LevelDB build bugfix
Diffstat (limited to 'src/makefile.unix')
| -rw-r--r-- | src/makefile.unix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 4401cf0d5..081edaf63 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 @@ -178,7 +182,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 |