Skip to content

Commit 76d8957

Browse files
committed
Merge bitcoin/bitcoin#28630: depends: update LD64_VERSION to 711
092daa2 contrib: add test for macOS linker version to symbol-check (fanquake) cefbf0b depends: update LD64_VERSION to 711 (fanquake) Pull request description: I forgot to do this in bitcoin/bitcoin@7d58152. Add a test so it's impossible to forget. ACKs for top commit: TheCharlatan: utACK 092daa2 achow101: ACK 092daa2 jarolrod: ACK 092daa2 hebasto: ACK 092daa2. laanwj: ACK 092daa2 Tree-SHA512: 37f0bdfd6607a7760eabe5efe279532ba0c59c0915161e08d5e3b9a0b7705839d62537d6e17406062f6a0a1db5407575da7cd671e9cb916e422e77f5649c6e2b
2 parents 90f7d8a + 092daa2 commit 76d8957

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

contrib/devtools/symbol-check.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@ def check_MACHO_sdk(binary) -> bool:
240240
return True
241241
return False
242242

243+
def check_MACHO_ld64(binary) -> bool:
244+
if binary.build_version.tools[0].version == [711, 0, 0]:
245+
return True
246+
return False
247+
243248
def check_PE_libraries(binary) -> bool:
244249
ok: bool = True
245250
for dylib in binary.libraries:
@@ -278,6 +283,7 @@ def check_ELF_ABI(binary) -> bool:
278283
('DYNAMIC_LIBRARIES', check_MACHO_libraries),
279284
('MIN_OS', check_MACHO_min_os),
280285
('SDK', check_MACHO_sdk),
286+
('LD64', check_MACHO_ld64),
281287
],
282288
lief.EXE_FORMATS.PE: [
283289
('DYNAMIC_LIBRARIES', check_PE_libraries),

depends/hosts/darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ OSX_MIN_VERSION=11.0
22
OSX_SDK_VERSION=11.0
33
XCODE_VERSION=12.2
44
XCODE_BUILD_ID=12B45b
5-
LD64_VERSION=609
5+
LD64_VERSION=711
66

77
OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers
88

0 commit comments

Comments
 (0)