diff options
| author | fanquake <fanquake@gmail.com> | 2024-05-02 15:57:43 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-06-10 13:15:22 +0100 |
| commit | 9946618f6174422d9ba93bf96c278269bebacf39 (patch) | |
| tree | 1d1ac3fff12f2185574bd73fa5090cbb23b0c279 | |
| parent | cad127235e307d7de0e9cc04708dbd31aa6c24b0 (diff) | |
| download | bitcoin-9946618f6174422d9ba93bf96c278269bebacf39.tar.xz | |
guix: use clang-toolchain-18 for macOS build
Version is 18.1.6.
| -rwxr-xr-x | contrib/devtools/symbol-check.py | 2 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index e4a62c2072..60d653de79 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -240,7 +240,7 @@ def check_MACHO_sdk(binary) -> bool: return False def check_MACHO_ld64(binary) -> bool: - if binary.build_version.tools[0].version == [17, 0, 6]: + if binary.build_version.tools[0].version == [18, 1, 6]: return True return False diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 40500ccb88..53569d7f7d 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -532,9 +532,9 @@ inspecting signatures in Mach-O binaries.") ((string-contains target "darwin") (list ;; Native GCC 11 toolchain gcc-toolchain-11 - clang-toolchain-17 - lld-17 - (make-lld-wrapper lld-17 #:lld-as-ld? #t) + clang-toolchain-18 + lld-18 + (make-lld-wrapper lld-18 #:lld-as-ld? #t) python-signapple zip)) (else '()))))) |