diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2023-05-15 20:41:46 +0000 |
---|---|---|
committer | Cory Fields <cory-nospam-@coryfields.com> | 2023-06-22 15:28:47 +0000 |
commit | c2cd47280cf5db5645917574dd95e9ec6036319e (patch) | |
tree | b5e9b239e4a32ed5fe4252845fb35d3c52ddfc84 | |
parent | a7261da479c2dffb89694b17c4f446ea0b302f34 (diff) | |
download | bitcoin-c2cd47280cf5db5645917574dd95e9ec6036319e.tar.xz |
depends: bump darwin clang to 11.1
Unfortunately clang 10 does not understand "-mmacosx-version-min=11.0",
as it expects to see only 10.x.
Bump minimally to 11.1 to fix that problem. This will likely be our last
binary toolchain bump, as it will soon be replaced with usage of upstream
vanilla llvm.
-rw-r--r-- | contrib/guix/manifest.scm | 2 | ||||
-rw-r--r-- | depends/packages/native_clang.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index f1c2854d09..1808eeffbe 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -608,5 +608,5 @@ inspecting signatures in Mach-O binaries.") ((string-contains target "-linux-") (list (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") - (list clang-toolchain-10 binutils cmake-minimal xorriso python-signapple)) + (list clang-toolchain-11 binutils cmake-minimal xorriso python-signapple)) (else '()))))) diff --git a/depends/packages/native_clang.mk b/depends/packages/native_clang.mk index b11037b83e..109796c0e6 100644 --- a/depends/packages/native_clang.mk +++ b/depends/packages/native_clang.mk @@ -1,12 +1,12 @@ package=native_clang -$(package)_version=10.0.1 +$(package)_version=11.1.0 $(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version) ifneq (,$(findstring aarch64,$(BUILD))) $(package)_file_name=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz -$(package)_sha256_hash=90dc69a4758ca15cd0ffa45d07fbf5bf4309d47d2c7745a9f0735ecffde9c31f +$(package)_sha256_hash=18df38247af3fba0e0e2991fb00d7e3cf3560b4d3509233a14af699ef0039e1c else $(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz -$(package)_sha256_hash=48b83ef827ac2c213d5b64f5ad7ed082c8bcb712b46644e0dc5045c6f462c231 +$(package)_sha256_hash=c691a558967fb7709fb81e0ed80d1f775f4502810236aa968b4406526b43bee1 endif define $(package)_stage_cmds |