diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2013-02-18 14:31:53 -0800 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-02-18 14:31:53 -0800 |
commit | 1c3924df3792f8039a3277267852e3db5c3055f5 (patch) | |
tree | 83511bfefdd0a78f87464b113c8b9cf84464f983 /src/makefile.unix | |
parent | dbac38170a537206d6aeb00f119b881560890e44 (diff) | |
parent | 1d83141803477f9625e301149fc9611f43f94592 (diff) | |
download | bitcoin-1c3924df3792f8039a3277267852e3db5c3055f5.tar.xz |
Merge pull request #2311 from gavinandresen/master
Pass compiler flags to leveldb make
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 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: |