Allow users to customize CXX, CXXFLAGS, and LDFLAGS normally
This commit is contained in:
parent
b4d0588d06
commit
a1e0bb5a09
|
@ -2,8 +2,6 @@
|
||||||
# Distributed under the MIT/X11 software license, see the accompanying
|
# Distributed under the MIT/X11 software license, see the accompanying
|
||||||
# file license.txt or http://www.opensource.org/licenses/mit-license.php.
|
# file license.txt or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
CXX=g++
|
|
||||||
|
|
||||||
USE_UPNP:=0
|
USE_UPNP:=0
|
||||||
|
|
||||||
DEFS=-DNOPCH
|
DEFS=-DNOPCH
|
||||||
|
@ -80,7 +78,8 @@ LIBS+= \
|
||||||
|
|
||||||
|
|
||||||
DEBUGFLAGS=-g
|
DEBUGFLAGS=-g
|
||||||
CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(HARDENING)
|
CXXFLAGS=-O2
|
||||||
|
xCXXFLAGS=-pthread -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
|
||||||
HEADERS = \
|
HEADERS = \
|
||||||
base58.h \
|
base58.h \
|
||||||
bignum.h \
|
bignum.h \
|
||||||
|
@ -125,24 +124,24 @@ all: bitcoind
|
||||||
-include obj/test/*.P
|
-include obj/test/*.P
|
||||||
|
|
||||||
obj/nogui/%.o: %.cpp
|
obj/nogui/%.o: %.cpp
|
||||||
$(CXX) -c $(CXXFLAGS) -MMD -o $@ $<
|
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
|
||||||
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
|
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
|
||||||
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
||||||
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
|
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
|
||||||
rm -f $(@:%.o=%.d)
|
rm -f $(@:%.o=%.d)
|
||||||
|
|
||||||
bitcoind: $(OBJS:obj/%=obj/nogui/%)
|
bitcoind: $(OBJS:obj/%=obj/nogui/%)
|
||||||
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
$(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
|
||||||
|
|
||||||
obj/test/%.o: test/%.cpp
|
obj/test/%.o: test/%.cpp
|
||||||
$(CXX) -c $(CXXFLAGS) -MMD -o $@ $<
|
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
|
||||||
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
|
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
|
||||||
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
|
||||||
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
|
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
|
||||||
rm -f $(@:%.o=%.d)
|
rm -f $(@:%.o=%.d)
|
||||||
|
|
||||||
test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%))
|
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)
|
$(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LDFLAGS) $(LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
-rm -f bitcoind test_bitcoin
|
-rm -f bitcoind test_bitcoin
|
||||||
|
|
Loading…
Reference in New Issue