diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-08-21 13:58:24 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-08-21 13:58:24 -0400 |
| commit | f39ab4c8d01a14ccc784b122ea133a67b8f75e10 (patch) | |
| tree | 1e0286b6f465158eba2fcc47a026f49108be1770 /src/makefile.unix | |
| parent | 1954d406918f4dc090c890aacfd1c38c62d3404b (diff) | |
| parent | da9e86c3b6cfdd13ed71744a082df94de1f3f41f (diff) | |
Merge branch 'testdata' of git://github.com/TheBlueMatt/bitcoin
Diffstat (limited to 'src/makefile.unix')
| -rw-r--r-- | src/makefile.unix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index de067f4ebb..c9a09ad020 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -4,6 +4,8 @@ USE_UPNP:=0 +LINK:=$(CXX) + DEFS=-DUSE_IPV6 -DBOOST_SPIRIT_THREADSAFE DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) @@ -141,7 +143,7 @@ obj/%.o: %.cpp rm -f $(@:%.o=%.d) bitcoind: $(OBJS:obj/%=obj/%) - $(CXX) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) + $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) @@ -153,7 +155,7 @@ obj-test/%.o: test/%.cpp rm -f $(@:%.o=%.d) test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - $(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS) + $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS) clean: -rm -f bitcoind test_bitcoin |