aboutsummaryrefslogtreecommitdiff
path: root/depends/builders
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-04-10 12:54:37 -0400
committerMarcoFalke <falke.marco@gmail.com>2020-04-10 12:55:12 -0400
commit1b307613604883daea4913a65da30ae073c9dc4d (patch)
treea24ce79427a9d07e26126f94eb78e3117ad3eeff /depends/builders
parent4eb1eeb02c57774b2de3e2d5fe3dab4f3da97ee0 (diff)
parentb919efadff3d0393f4a8c3c1dc735f7ac5c665bb (diff)
downloadbitcoin-1b307613604883daea4913a65da30ae073c9dc4d.tar.xz
Merge #16367: Multiprocess build support
b919efadff3d0393f4a8c3c1dc735f7ac5c665bb depends: Use default macos clang compiler (Russell Yanofsky) d54f64c6c700be0604190f52c84fc5f1cdd9f02f Add multiprocess travis configuration (Russell Yanofsky) 787f40668dc15980c3d6de028d7950c08175d84a Set LD_LIBRARY_PATH consistently in travis tests (Russell Yanofsky) d6306466626635e6fee44385e6a688c8dc118eb5 libmultiprocess depends build (Russell Yanofsky) e6e44eedd56ecaf59f3fabf8e07ab7dee0ddb1b6 Multiprocess build changes (Russell Yanofsky) Pull request description: This PR is part of the [process separation project](https://github.com/bitcoin/bitcoin/projects/10). This splits autotools, depends build, and travis changes out of #10102, so code changes and build system changes can be reviewed separately. ACKs for top commit: hebasto: re-ACK b919efadff3d0393f4a8c3c1dc735f7ac5c665bb, rebased only since my [previous](https://github.com/bitcoin/bitcoin/pull/16367#issuecomment-605514556) review. Tree-SHA512: ebc5e403cc99a0d9629ed7fe1595e01d57e6d1255cbf03968a3196ff6f528f734c78060fdc065724ee1f923bcc5aa2b29470fcb36a7f15957eb57c76d58178a4
Diffstat (limited to 'depends/builders')
-rw-r--r--depends/builders/darwin.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk
index eb587fca89..9513b6c21c 100644
--- a/depends/builders/darwin.mk
+++ b/depends/builders/darwin.mk
@@ -1,5 +1,5 @@
-build_darwin_CC:=$(shell xcrun -f clang)
-build_darwin_CXX:=$(shell xcrun -f clang++)
+build_darwin_CC:=clang
+build_darwin_CXX:=clang++
build_darwin_AR:=$(shell xcrun -f ar)
build_darwin_RANLIB:=$(shell xcrun -f ranlib)
build_darwin_STRIP:=$(shell xcrun -f strip)