sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#28337: use Clang 15 for macOS cross-compilation

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2023-08-24 14:42:45 +01:00
parent ba281413b0
commit fe94154851
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/test/00_setup_env_mac.sh
View File

@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
export CONTAINER_NAME=ci_macos_cross export CONTAINER_NAME=ci_macos_cross
export HOST=x86_64-apple-darwin export HOST=x86_64-apple-darwin
export PACKAGES="cmake libz-dev libtinfo5 python3-setuptools xorriso" export PACKAGES="cmake libz-dev python3-setuptools xorriso"
export XCODE_VERSION=12.2 export XCODE_VERSION=12.2
export XCODE_BUILD_ID=12B45b export XCODE_BUILD_ID=12B45b
export RUN_UNIT_TESTS=false export RUN_UNIT_TESTS=false

2
contrib/guix/manifest.scm
View File

@ -609,7 +609,7 @@ inspecting signatures in Mach-O binaries.")
(list ;; Native GCC 11 toolchain (list ;; Native GCC 11 toolchain
gcc-toolchain-11 gcc-toolchain-11
binutils binutils
clang-toolchain-11 clang-toolchain-15
python-signapple python-signapple
xorriso)) xorriso))
(else '()))))) (else '())))))

2
depends/README.md
View File

@ -47,7 +47,7 @@ The paths are automatically configured and no other options are needed unless ta
#### For macOS cross compilation #### For macOS cross compilation
sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools libtinfo5 xorriso sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools xorriso
Note: You must obtain the macOS SDK before proceeding with a cross-compile. Note: You must obtain the macOS SDK before proceeding with a cross-compile.
Under the depends directory, create a subdirectory named `SDKs`. Under the depends directory, create a subdirectory named `SDKs`.

8
depends/packages/native_clang.mk
View File

@ -1,12 +1,12 @@
package=native_clang package=native_clang
$(package)_version=11.1.0 $(package)_version=15.0.6
$(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version) $(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
ifneq (,$(findstring aarch64,$(BUILD))) ifneq (,$(findstring aarch64,$(BUILD)))
$(package)_file_name=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz $(package)_file_name=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
$(package)_sha256_hash=18df38247af3fba0e0e2991fb00d7e3cf3560b4d3509233a14af699ef0039e1c $(package)_sha256_hash=8ca4d68cf103da8331ca3f35fe23d940c1b78fb7f0d4763c1c059e352f5d1bec
else else
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz $(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
$(package)_sha256_hash=c691a558967fb7709fb81e0ed80d1f775f4502810236aa968b4406526b43bee1 $(package)_sha256_hash=38bc7f5563642e73e69ac5626724e206d6d539fbef653541b34cae0ba9c3f036
endif endif
define $(package)_stage_cmds define $(package)_stage_cmds