Skip to content

Commit 8371914

Browse files
committed
Merge bitcoin#28337: build: use Clang 15 for macOS cross-compilation
ff42d81 guix: use clang-toolchain-15 for macOS compilation (fanquake) 94955b4 depends: use LLVM/Clang 15.0.6 for macOS cross-compile (fanquake) Pull request description: This will end up being a blocker for bitcoin#28210, and is already part of bitcoin#21778, even though an even newer LLVM/Clang combination is required (and still missing from upstream Guix). Seems straight-forward enough to just bump the macOS compiler to a more modern Clang. ACKs for top commit: TheCharlatan: re-ACK ff42d81 Tree-SHA512: 8af4b54c3a56abb3825c6470444a28e14e9c69820c09ec4a33acebb8ae434df9ae18163c088a582130cc68755293a7e2bde5d065763919d94064ff9b3f83730f
2 parents 03675b2 + ff42d81 commit 8371914

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
1111
export CONTAINER_NAME=ci_macos_cross
1212
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04"
1313
export HOST=x86_64-apple-darwin
14-
export PACKAGES="cmake libz-dev libtinfo5 python3-setuptools xorriso"
14+
export PACKAGES="cmake libz-dev python3-setuptools xorriso"
1515
export XCODE_VERSION=12.2
1616
export XCODE_BUILD_ID=12B45b
1717
export RUN_UNIT_TESTS=false

contrib/guix/manifest.scm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,5 +610,5 @@ inspecting signatures in Mach-O binaries.")
610610
((string-contains target "-linux-")
611611
(list (make-bitcoin-cross-toolchain target)))
612612
((string-contains target "darwin")
613-
(list clang-toolchain-11 binutils cmake-minimal xorriso python-signapple))
613+
(list clang-toolchain-15 binutils cmake-minimal xorriso python-signapple))
614614
(else '())))))

depends/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The paths are automatically configured and no other options are needed unless ta
4848

4949
#### For macOS cross compilation
5050

51-
sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools libtinfo5 xorriso
51+
sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools xorriso
5252

5353
Note: You must obtain the macOS SDK before proceeding with a cross-compile.
5454
Under the depends directory, create a subdirectory named `SDKs`.

depends/packages/native_clang.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package=native_clang
2-
$(package)_version=11.1.0
2+
$(package)_version=15.0.6
33
$(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
44
ifneq (,$(findstring aarch64,$(BUILD)))
55
$(package)_file_name=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
6-
$(package)_sha256_hash=18df38247af3fba0e0e2991fb00d7e3cf3560b4d3509233a14af699ef0039e1c
6+
$(package)_sha256_hash=8ca4d68cf103da8331ca3f35fe23d940c1b78fb7f0d4763c1c059e352f5d1bec
77
else
8-
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
9-
$(package)_sha256_hash=c691a558967fb7709fb81e0ed80d1f775f4502810236aa968b4406526b43bee1
8+
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
9+
$(package)_sha256_hash=38bc7f5563642e73e69ac5626724e206d6d539fbef653541b34cae0ba9c3f036
1010
endif
1111

1212
define $(package)_stage_cmds

0 commit comments

Comments
 (0)