Skip to content

Commit 7e9df77

Browse files
committed
build: update to macOS 15.0 SDK from Xcode 16.0
1 parent bfb638f commit 7e9df77

7 files changed

Lines changed: 20 additions & 20 deletions

File tree

ci/test/00_setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out/$HOST}
7171
# Folder where the build is done (dist and out-of-tree build).
7272
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build-ci}
7373
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/releases/$HOST}
74-
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
74+
export SDK_URL=${SDK_URL:-https://s3.us-west-2.amazonaws.com/dash-depends-sources}
7575
export DOCKER_PACKAGES=${DOCKER_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps}
7676
export GOAL=${GOAL:-install}
7777
export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets}

ci/test/00_setup_env_mac.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
1010
export HOST=x86_64-apple-darwin
11-
export PACKAGES="clang cmake lld llvm zip"
12-
export XCODE_VERSION=15.0
13-
export XCODE_BUILD_ID=15A240d
11+
export PACKAGES="clang cmake lld llvm zip"
12+
export XCODE_VERSION=16.0
13+
export XCODE_BUILD_ID=16A242d
1414
export RUN_UNIT_TESTS=false
1515
export RUN_FUNCTIONAL_TESTS=false
1616
export GOAL="all deploy"

contrib/containers/guix/scripts/setup-sdk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ export LC_ALL=C.UTF-8
77

88
set -eo pipefail
99

10-
SDK_URL="${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}"
10+
SDK_URL="${SDK_URL:-https://s3.us-west-2.amazonaws.com/dash-depends-sources}"
1111
SDK_PATH="${SDK_PATH:-depends/SDKs}"
1212
SDK_SOURCES="${SDK_SOURCES:-depends/sdk-sources}"
13-
XCODE_VERSION="${XCODE_VERSION:-15.0}"
14-
XCODE_RELEASE="${XCODE_RELEASE:-15A240d}"
13+
XCODE_VERSION="${XCODE_VERSION:-16.0}"
14+
XCODE_RELEASE="${XCODE_RELEASE:-16A242d}"
1515
XCODE_ARCHIVE="Xcode-${XCODE_VERSION}-${XCODE_RELEASE}-extracted-SDK-with-libcxx-headers"
1616
XCODE_AR_PATH="${SDK_SOURCES}/${XCODE_ARCHIVE}.tar.gz"
1717

contrib/guix/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ details.
249249
Set the path where _extracted_ SDKs can be found. This is passed through to
250250
the depends tree. Note that this is should be set to the _parent_ directory of
251251
the actual SDK (e.g. `SDK_PATH=$HOME/Downloads/macOS-SDKs` instead of
252-
`$HOME/Downloads/macOS-SDKs/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers`).
252+
`$HOME/Downloads/macOS-SDKs/Xcode-16.0-16A242d-extracted-SDK-with-libcxx-headers`).
253253

254254
The path that this environment variable points to **must be a directory**, and
255255
**NOT a symlink to a directory**.

contrib/guix/symbol-check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,12 @@ def check_MACHO_libraries(binary) -> bool:
235235
return ok
236236

237237
def check_MACHO_min_os(binary) -> bool:
238-
if binary.build_version.minos == [14,0,0]:
238+
if binary.build_version.minos == [14, 0, 0]:
239239
return True
240240
return False
241241

242242
def check_MACHO_sdk(binary) -> bool:
243-
if binary.build_version.sdk == [14, 0, 0]:
243+
if binary.build_version.sdk == [15, 0, 0]:
244244
return True
245245
return False
246246

contrib/macdeploy/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ When complete, it will have produced `Dash-Core.zip`.
1515
A free Apple Developer Account is required to proceed.
1616

1717
Our macOS SDK can be extracted from
18-
[Xcode_15.xip](https://download.developer.apple.com/Developer_Tools/Xcode_15/Xcode_15.xip).
18+
[Xcode_16.xip](https://download.developer.apple.com/Developer_Tools/Xcode_16/Xcode_16.xip).
1919

2020
Alternatively, after logging in to your account go to 'Downloads', then 'More'
21-
and search for [`Xcode 15`](https://developer.apple.com/download/all/?q=Xcode%2015).
21+
and search for [`Xcode 16`](https://developer.apple.com/download/all/?q=Xcode%2016).
2222

2323
An Apple ID and cookies enabled for the hostname are needed to download this.
2424

25-
The `sha256sum` of the downloaded XIP archive should be `4daaed2ef2253c9661779fa40bfff50655dc7ec45801aba5a39653e7bcdde48e`.
25+
The `sha256sum` of the downloaded XIP archive should be `4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3`.
2626

2727
To extract the `.xip` on Linux:
2828

@@ -33,13 +33,13 @@ git clone https://github.com/bitcoin-core/apple-sdk-tools.git
3333

3434
# Unpack the .xip and place the resulting Xcode.app in your current
3535
# working directory
36-
python3 apple-sdk-tools/extract_xcode.py -f Xcode_15.xip | cpio -d -i
36+
python3 apple-sdk-tools/extract_xcode.py -f Xcode_16.xip | cpio -d -i
3737
```
3838

3939
On macOS:
4040

4141
```bash
42-
xip -x Xcode_15.xip
42+
xip -x Xcode_16.xip
4343
```
4444

4545
### 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.
5151
./contrib/macdeploy/gen-sdk '/path/to/Xcode.app'
5252
```
5353

54-
The generated archive should be: `Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers.tar.gz`.
55-
The `sha256sum` should be `c0c2e7bb92c1fee0c4e9f3a485e4530786732d6c6dd9e9f418c282aa6892f55d`.
54+
The generated archive should be: `Xcode-16.0-16A242d-extracted-SDK-with-libcxx-headers.tar.gz`.
55+
The `sha256sum` should be `bce59aa16560f182e44200a0b9539bd637c8b5c7089fbff13b0712730ce162ff`.
5656

5757
## Deterministic macOS App Notes
5858

depends/hosts/darwin.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OSX_MIN_VERSION=14.0
2-
OSX_SDK_VERSION=14.0
3-
XCODE_VERSION=15.0
4-
XCODE_BUILD_ID=15A240d
2+
OSX_SDK_VERSION=15.0
3+
XCODE_VERSION=16.0
4+
XCODE_BUILD_ID=16A242d
55
LLD_VERSION=711
66

77
OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers

0 commit comments

Comments
 (0)