Skip to content

Commit adf543d

Browse files
theunidongcarl
authored andcommitted
darwin: pass mlinker-version so that clang enables new features
Without this clang fails to add any newly-added linker features. Removing this in ca5055a was likely a regression. See bitcoin/bitcoin#19240 (comment) for more discussion.
1 parent 2418f73 commit adf543d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

depends/hosts/darwin.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ OSX_MIN_VERSION=10.12
22
OSX_SDK_VERSION=10.15.1
33
XCODE_VERSION=11.3.1
44
XCODE_BUILD_ID=11C505
5+
LD64_VERSION=530
6+
57
OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers
6-
darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK)
7-
darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -stdlib=libc++
8+
darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
9+
darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -stdlib=libc++ -mlinker-version=$(LD64_VERSION)
810

911
darwin_CFLAGS=-pipe
1012
darwin_CXXFLAGS=$(darwin_CFLAGS)

0 commit comments

Comments
 (0)