aboutsummaryrefslogtreecommitdiff
path: root/src/makefile.unix
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-02-15 14:10:01 -0500
committerGavin Andresen <gavinandresen@gmail.com>2013-02-15 19:55:44 -0500
commitfbd860287e6474bd7a61013796541bf2ea72d5cd (patch)
tree2cb4bd14ab1c17d81adb335d55902815befa5890 /src/makefile.unix
parent2f0fa79db290d5139c27409055b2035099afa6fd (diff)
Pass compiler flags down into leveldb make
Fixes issue#2288. Includes cleanups from Luke's pull 2243.
Diffstat (limited to 'src/makefile.unix')
-rw-r--r--src/makefile.unix6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/makefile.unix b/src/makefile.unix
index b52a0f8aea..ece2f59cf5 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -101,6 +101,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para
xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
OBJS= \
+ leveldb/libleveldb.a \
obj/alert.o \
obj/version.o \
obj/checkpoints.o \
@@ -142,12 +143,12 @@ test check: test_bitcoin FORCE
#
# LevelDB support
#
+MAKEOVERRIDES =
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a:
- @echo "Building LevelDB ..." && cd leveldb && $(MAKE) libleveldb.a libmemenv.a && cd ..
-obj/leveldb.o: leveldb/libleveldb.a
+ @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
# auto-generated dependencies:
-include obj/*.P
@@ -187,5 +188,6 @@ clean:
-rm -f obj/*.P
-rm -f obj-test/*.P
-rm -f obj/build.h
+ -cd leveldb && $(MAKE) clean || true
FORCE: