source/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-08 18:49:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

contrib: update macOS SDK to Xcode-26.1.1-17B100

Browse Source
This commit is contained in:
fanquake
2025-12-09 15:42:38 +00:00
parent 57a778ed25
commit a89e1618dd
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci/test/00_setup_env_mac_cross.sh
View File

@@ -12,8 +12,8 @@ export CONTAINER_NAME=ci_macos_cross
export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie" # Check that https://packages.debian.org/trixie/clang (version 19, similar to guix) can cross-compile export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie" # Check that https://packages.debian.org/trixie/clang (version 19, similar to guix) can cross-compile
export HOST=arm64-apple-darwin export HOST=arm64-apple-darwin
export PACKAGES="clang lld llvm zip" export PACKAGES="clang lld llvm zip"
export XCODE_VERSION=15.0 export XCODE_VERSION=26.1.1
export XCODE_BUILD_ID=15A240d export XCODE_BUILD_ID=17B100
export RUN_UNIT_TESTS=false export RUN_UNIT_TESTS=false
export RUN_FUNCTIONAL_TESTS=false export RUN_FUNCTIONAL_TESTS=false
export GOAL="deploy" export GOAL="deploy"

4
ci/test/00_setup_env_mac_cross_intel.sh
View File

@@ -12,8 +12,8 @@ export CONTAINER_NAME=ci_macos_cross_intel
export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie" # Check that https://packages.debian.org/trixie/clang (version 19, similar to guix) can cross-compile export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie" # Check that https://packages.debian.org/trixie/clang (version 19, similar to guix) can cross-compile
export HOST=x86_64-apple-darwin export HOST=x86_64-apple-darwin
export PACKAGES="clang lld llvm zip" export PACKAGES="clang lld llvm zip"
export XCODE_VERSION=15.0 export XCODE_VERSION=26.1.1
export XCODE_BUILD_ID=15A240d export XCODE_BUILD_ID=17B100
export RUN_UNIT_TESTS=false export RUN_UNIT_TESTS=false
export RUN_FUNCTIONAL_TESTS=false export RUN_FUNCTIONAL_TESTS=false
export GOAL="deploy" export GOAL="deploy"

2
contrib/guix/README.md
View File

@@ -261,7 +261,7 @@ details.
Set the path where _extracted_ SDKs can be found. This is passed through to Set the path where _extracted_ SDKs can be found. This is passed through to
the depends tree. Note that this should be set to the _parent_ directory of the depends tree. Note that this should be set to the _parent_ directory of
the actual SDK (e.g. `SDK_PATH=$HOME/Downloads/macOS-SDKs` instead of the actual SDK (e.g. `SDK_PATH=$HOME/Downloads/macOS-SDKs` instead of
`$HOME/Downloads/macOS-SDKs/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers`). `$HOME/Downloads/macOS-SDKs/Xcode-26.1.1-17B100-extracted-SDK-with-libcxx-headers`).
The path that this environment variable points to **must be a directory**, and The path that this environment variable points to **must be a directory**, and
**NOT a symlink to a directory**. **NOT a symlink to a directory**.

14
contrib/macdeploy/README.md
View File

@@ -15,14 +15,14 @@ When complete, it will have produced `Bitcoin-Core.zip`.
A free Apple Developer Account is required to proceed. A free Apple Developer Account is required to proceed.
Our macOS SDK can be extracted from Our macOS SDK can be extracted from
[Xcode_15.xip](https://download.developer.apple.com/Developer_Tools/Xcode_15/Xcode_15.xip). [Xcode_26.1.1_Apple_silicon.xip](https://download.developer.apple.com/Developer_Tools/Xcode_26.1.1/Xcode_26.1.1_Apple_silicon.xip).
Alternatively, after logging in to your account go to 'Downloads', then 'More' Alternatively, after logging in to your account go to 'Downloads', then 'More'
and search for [`Xcode 15`](https://developer.apple.com/download/all/?q=Xcode%2015). and search for [`Xcode 26.1.1`](https://developer.apple.com/download/all/?q=Xcode%2026.1.1).
An Apple ID and cookies enabled for the hostname are needed to download this. An Apple ID and cookies enabled for the hostname are needed to download this.
The `sha256sum` of the downloaded XIP archive should be `4daaed2ef2253c9661779fa40bfff50655dc7ec45801aba5a39653e7bcdde48e`. The `sha256sum` of the downloaded XIP archive should be `f4c65b01e2807372b61553c71036dbfef492d7c79d4c380a5afb61aa1018e555`.
To extract the `.xip` on Linux: To extract the `.xip` on Linux:
@@ -33,13 +33,13 @@ git clone https://github.com/bitcoin-core/apple-sdk-tools.git
# Unpack the .xip and place the resulting Xcode.app in your current # Unpack the .xip and place the resulting Xcode.app in your current
# working directory # working directory
python3 apple-sdk-tools/extract_xcode.py -f Xcode_15.xip | cpio -d -i python3 apple-sdk-tools/extract_xcode.py -f Xcode_26.1.1_Apple_silicon.xip | cpio -d -i
``` ```
On macOS: On macOS:
```bash ```bash
xip -x Xcode_15.xip xip -x Xcode_26.1.1_Apple_silicon.xip
``` ```
### Step 2: Generating the SDK tarball from `Xcode.app` ### Step 2: Generating the SDK tarball from `Xcode.app`
@@ -51,8 +51,8 @@ path to `Xcode.app` (extracted in the previous stage) as the first argument.
./contrib/macdeploy/gen-sdk.py '/path/to/Xcode.app' ./contrib/macdeploy/gen-sdk.py '/path/to/Xcode.app'
``` ```
The generated archive should be: `Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers.tar`. The generated archive should be: `Xcode-26.1.1-17B100-extracted-SDK-with-libcxx-headers.tar`.
The `sha256sum` should be `95b00dc41fa090747dc0a7907a5031a2fcb2d7f95c9584ba6bccdb99b6e3d498`. The `sha256sum` should be `9600fa93644df674ee916b5e2c8a6ba8dacf631996a65dc922d003b98b5ea3b1`.
## Deterministic macOS App Notes ## Deterministic macOS App Notes

4
depends/hosts/darwin.mk
View File

@@ -1,7 +1,7 @@
OSX_MIN_VERSION=14.0 OSX_MIN_VERSION=14.0
OSX_SDK_VERSION=14.0 OSX_SDK_VERSION=14.0
XCODE_VERSION=15.0 XCODE_VERSION=26.1.1
XCODE_BUILD_ID=15A240d XCODE_BUILD_ID=17B100
LLD_VERSION=711 LLD_VERSION=711
OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers