sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #13465: Avoid concurrency issue when make multiple target

Browse Source 
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
This commit is contained in:
MarcoFalke 2018-06-15 13:59:07 -04:00 committed by pasta
parent 371e213067
commit 965d601285
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -94,9 +94,9 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@
$(OSX_APP)/Contents/MacOS/Dash-Qt: $(BITCOIN_QT_BIN)
$(OSX_APP)/Contents/MacOS/Dash-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)