Skip to content

Commit 81069a7

Browse files
author
MarcoFalke
committed
Merge #13465: Avoid concurrency issue when make multiple target
cf01fd6 Avoid concurrency issue (Chun Kuan Lee) Pull request description: From #13406, changed travis job target for Mac to `all deploy`, but this could cause a race condition. Simply add `.NOTPARALLEL` to avoid it. Related jobs: https://travis-ci.org/bitcoin/bitcoin/jobs/391863281 https://travis-ci.org/bitcoin/bitcoin/jobs/391907335 Close #13469 Tree-SHA512: 75c6585fe770dc70e6256dcdf97af37274f95a9240ed5a5cea2ca92b8411893b80327335587270351b128f56cb2e00f684db7c19b1602048132b734dad6ececa
2 parents be27048 + cf01fd6 commit 81069a7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
9595
$(MKDIR_P) $(@D)
9696
$(INSTALL_DATA) $< $@
9797

98-
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
98+
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: all-recursive
9999
$(MKDIR_P) $(@D)
100-
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
100+
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@
101101

102102
$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
103103
$(MKDIR_P) $(@D)

0 commit comments

Comments
 (0)