Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#28630: depends: update LD64_VERSION to 711
Browse files Browse the repository at this point in the history
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
  • Loading branch information
achow101 committed Oct 16, 2023
2 parents 90f7d8a + 092daa2 commit 76d8957
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions contrib/devtools/symbol-check.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,11 @@ def check_MACHO_sdk(binary) -> bool:
return True
return False

def check_MACHO_ld64(binary) -> bool:
if binary.build_version.tools[0].version == [711, 0, 0]:
return True
return False

def check_PE_libraries(binary) -> bool:
ok: bool = True
for dylib in binary.libraries:
Expand Down Expand Up @@ -278,6 +283,7 @@ def check_ELF_ABI(binary) -> bool:
('DYNAMIC_LIBRARIES', check_MACHO_libraries),
('MIN_OS', check_MACHO_min_os),
('SDK', check_MACHO_sdk),
('LD64', check_MACHO_ld64),
],
lief.EXE_FORMATS.PE: [
('DYNAMIC_LIBRARIES', check_PE_libraries),
Expand Down
2 changes: 1 addition & 1 deletion depends/hosts/darwin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ OSX_MIN_VERSION=11.0
OSX_SDK_VERSION=11.0
XCODE_VERSION=12.2
XCODE_BUILD_ID=12B45b
LD64_VERSION=609
LD64_VERSION=711

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

Expand Down

0 comments on commit 76d8957

Please sign in to comment.