aboutsummaryrefslogtreecommitdiff
path: root/src/makefile.unix
diff options
context:
space:
mode:
authorVegard Nossum <vegard.nossum@gmail.com>2011-07-31 20:00:38 +0200
committerGavin Andresen <gavinandresen@gmail.com>2011-08-08 14:31:08 -0400
commite707d29dd601bbe691175b72686caeaea29b1cbc (patch)
tree81f0d487000519207776a75b9d679ee0f36aa41f /src/makefile.unix
parent02962ba848d1f7d58fe0f12a783400fc15e7260b (diff)
Fix testing setup
There were some problems with the existing testing setup: - Makefile rules for test-file compilation used CFLAGS instead of CXXFLAGS in makefile.unix
Diffstat (limited to 'src/makefile.unix')
-rw-r--r--src/makefile.unix6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/makefile.unix b/src/makefile.unix
index 0567f8b75e..ba9d0ca11d 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -78,10 +78,10 @@ bitcoind: $(OBJS:obj/%=obj/nogui/%)
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
obj/test/%.o: test/%.cpp $(HEADERS)
- $(CXX) -c $(CFLAGS) -o $@ $<
+ $(CXX) -c $(CXXFLAGS) -o $@ $<
-test_bitcoin: obj/test/test_bitcoin.o
- $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework
+test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%))
+ $(CXX) $(CXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LIBS)
clean:
-rm -f bitcoin bitcoind test_bitcoin