Skip to content

Commit 5c8820b

Browse files
committed
Merge bitcoin#22436: build: use aarch64 Clang if cross-compiling for darwin on aarch64
54c7754 build: use aarch64 Clang if cross-compiling for darwin on aarch64 (fanquake) Pull request description: If we're cross-compiling for darwin on aarch64 hardware, we need to use a Clang that will run on that hardware. Only tested in a Linux Docker container (aarch64-unknown-linux-gnu), running on an Apple M1 mac-mini (aarch64-apple-darwin20.5.0). ACKs for top commit: hebasto: ACK 54c7754, I agree it can be merged (fix in bitcoin#22448 is orthogonal to this one). Tree-SHA512: 66c530097a5dc072a0a00dc22eb3d4a7d923dfa8ab8160f7c3e395cbe58da324f367548d673c0510606f5225d5d37bb5607a76b1703b8b03ac7d2cceeccbd542
2 parents 201c5e4 + 54c7754 commit 5c8820b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

depends/packages/native_clang.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
package=native_clang
22
$(package)_version=10.0.1
33
$(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
4+
ifneq (,$(findstring aarch64,$(BUILD)))
5+
$(package)_download_file=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
6+
$(package)_file_name=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
7+
$(package)_sha256_hash=90dc69a4758ca15cd0ffa45d07fbf5bf4309d47d2c7745a9f0735ecffde9c31f
8+
else
49
$(package)_download_file=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
510
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
611
$(package)_sha256_hash=48b83ef827ac2c213d5b64f5ad7ed082c8bcb712b46644e0dc5045c6f462c231
12+
endif
713

814
define $(package)_preprocess_cmds
915
rm -f $($(package)_extract_dir)/lib/libc++abi.so*

0 commit comments

Comments
 (0)