# HG changeset patch # User Matt Corallo # Date 1344392408 -7200 # Node ID 1eba64a373b9e5f7535c1ff17385b4a39c6e2dff # Parent ad35cc8df83aeeceb01f9332ae72b3ff84386c38 Allow setting a different linker than compiler in makefile.unix diff --git a/src/makefile.unix b/src/makefile.unix --- 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 @@ 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 @@ 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