diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-09-15 23:54:09 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-09-15 23:54:09 -0700 |
| commit | 17e0f675058f6d15b3f1629995342a5ed93ed3f5 (patch) | |
| tree | 07be650bbbd9d7ac03e5f89d706f9aff523ee847 | |
| parent | 2975db76b3c6ce5f70d7dc547e74c61543191b22 (diff) | |
| parent | cae63be6c95b19c236a2333c1f2456e016e13f0f (diff) | |
| download | bitcoin-17e0f675058f6d15b3f1629995342a5ed93ed3f5.tar.xz | |
Merge pull request #3001 from theuni/fix-make-race
autotools: fix a parallel build race condition spotted by the pull-tester
| -rw-r--r-- | src/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 65e675e525..2935c2daa9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,13 +50,12 @@ bitcoind_SOURCES = bitcoind.cpp AM_CPPFLAGS += $(BDB_CPPFLAGS) bitcoind_LDADD += $(BDB_LIBS) -leveldb/libleveldb.a: - @echo "Building LevelDB ..." && cd leveldb && CXX="$(CXX)" CC="$(CC)" \ - PLATFORM=$(TARGET_OS) AR="$(AR)" $(MAKE) $(LEVELDB_TARGET_FLAGS) OPT="$(CXXFLAGS) $(CPPFLAGS)" libleveldb.a +leveldb/libleveldb.a: leveldb/libmemenv.a -leveldb/libmemenv.a: - @echo "Building LevelDB ..." && cd leveldb && CXX="$(CXX)" CC="$(CC)" \ - PLATFORM=$(TARGET_OS) AR="$(AR)" $(MAKE) $(LEVELDB_TARGET_FLAGS) OPT="$(CXXFLAGS) $(CPPFLAGS)" libmemenv.a +leveldb/%.a: + @echo "Building LevelDB ..." && $(MAKE) -C $(@D) $(@F) CXX="$(CXX)" \ + CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \ + OPT="$(CXXFLAGS) $(CPPFLAGS)" qt/bitcoinstrings.cpp: $(libbitcoin_a_SOURCES) @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" |