diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2020-06-22 16:46:16 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2020-06-22 17:00:45 -0400 |
| commit | adf543d7144a44f8cd28a090a21c4e2a606862da (patch) | |
| tree | 07697319b1f91f424d839b1d134625a4fe9c89b0 /depends/hosts | |
| parent | 2418f739f75824d6689369f326b960cec254cf56 (diff) | |
| download | bitcoin-adf543d7144a44f8cd28a090a21c4e2a606862da.tar.xz | |
darwin: pass mlinker-version so that clang enables new features
Without this clang fails to add any newly-added linker features.
Removing this in ca5055a5aa07aba81a87cf12f6f0526a63c423b5 was likely a
regression.
See https://github.com/bitcoin/bitcoin/pull/19240#issuecomment-647764049
for more discussion.
Diffstat (limited to 'depends/hosts')
| -rw-r--r-- | depends/hosts/darwin.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk index 1302b42884..5f0bffa5cb 100644 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -2,9 +2,11 @@ OSX_MIN_VERSION=10.12 OSX_SDK_VERSION=10.15.1 XCODE_VERSION=11.3.1 XCODE_BUILD_ID=11C505 +LD64_VERSION=530 + OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers -darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -stdlib=libc++ +darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) +darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -stdlib=libc++ -mlinker-version=$(LD64_VERSION) darwin_CFLAGS=-pipe darwin_CXXFLAGS=$(darwin_CFLAGS) |