diff options
| author | MarcoFalke <[email protected]> | 2018-06-15 13:59:07 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-06-15 13:59:10 -0400 |
| commit | 81069a75bd71f21f9cbab97c68f7347073cc9ae5 (patch) | |
| tree | 6db6898d13ad63d9e067c61fc741fa6772cb0d45 | |
| parent | Merge #13241: scripted-diff: Avoid temporary copies when looping over std::map (diff) | |
| parent | Avoid concurrency issue (diff) | |
| download | discoin-81069a75bd71f21f9cbab97c68f7347073cc9ae5.tar.xz discoin-81069a75bd71f21f9cbab97c68f7347073cc9ae5.zip | |
Merge #13465: Avoid concurrency issue when make multiple target
cf01fd6f9c 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
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 0ed3dd289..f3f3302fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,9 +95,9 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN) +$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: all-recursive $(MKDIR_P) $(@D) - STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(MKDIR_P) $(@D) |