Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-04 08:22:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#28630: depends: update LD64_VERSION to 711

Browse Source 
092daa2f95 contrib: add test for macOS linker version to symbol-check (fanquake)
cefbf0bc20 depends: update LD64_VERSION to 711 (fanquake)

Pull request description:

  I forgot to do this in 7d5815293e.
  Add a test so it's impossible to forget.

ACKs for top commit:
  TheCharlatan:
    utACK 092daa2f95
  achow101:
    ACK 092daa2f95
  jarolrod:
    ACK 092daa2f95
  hebasto:
    ACK 092daa2f95.
  laanwj:
    ACK 092daa2f95

Tree-SHA512: 37f0bdfd6607a7760eabe5efe279532ba0c59c0915161e08d5e3b9a0b7705839d62537d6e17406062f6a0a1db5407575da7cd671e9cb916e422e77f5649c6e2b
This commit is contained in:
Andrew Chow 2023-10-16 13:29:08 -04:00
commit 76d89579b5
No known key found for this signature in database
GPG Key ID: 17565732E08E5E41
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/devtools/symbol-check.py
View File

@ -240,6 +240,11 @@ def check_MACHO_sdk(binary) -> bool:
return True return True
return False 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: def check_PE_libraries(binary) -> bool:
ok: bool = True ok: bool = True
for dylib in binary.libraries: for dylib in binary.libraries:
@ -278,6 +283,7 @@ lief.EXE_FORMATS.MACHO: [
('DYNAMIC_LIBRARIES', check_MACHO_libraries), ('DYNAMIC_LIBRARIES', check_MACHO_libraries),
('MIN_OS', check_MACHO_min_os), ('MIN_OS', check_MACHO_min_os),
('SDK', check_MACHO_sdk), ('SDK', check_MACHO_sdk),
('LD64', check_MACHO_ld64),
], ],
lief.EXE_FORMATS.PE: [ lief.EXE_FORMATS.PE: [
('DYNAMIC_LIBRARIES', check_PE_libraries), ('DYNAMIC_LIBRARIES', check_PE_libraries),

2
depends/hosts/darwin.mk
View File

@ -2,7 +2,7 @@ OSX_MIN_VERSION=11.0
OSX_SDK_VERSION=11.0 OSX_SDK_VERSION=11.0
XCODE_VERSION=12.2 XCODE_VERSION=12.2
XCODE_BUILD_ID=12B45b 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 OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers