From da9e86c3b6cfdd13ed71744a082df94de1f3f41f Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Wed, 8 Aug 2012 04:20:08 +0200 Subject: [PATCH] Allow setting a different linker than compiler in makefile.unix --- src/makefile.unix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/makefile.unix b/src/makefile.unix index 857f44531..0b56b8d7f 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)) @@ -138,7 +140,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)) @@ -150,7 +152,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