Skip to content

Commit f81ca64

Browse files
authored
cmake: bump macOS and Xcode version (#2857)
1 parent 171b64d commit f81ca64

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

.github/workflows/macOS.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ concurrency:
1212

1313
jobs:
1414
osx:
15-
runs-on: macos-14
16-
env:
17-
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
15+
runs-on: macos-latest
1816

1917
# Disable on external PRs
2018
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ delivering the first release of [Erigon++] starting from Erigon 2.59.0.
4545
Erigon++ is supported on platforms:
4646

4747
* Linux x86_64 with glibc 34+, glibcpp 30+ (such as Debian 12+, Ubuntu 22+, etc.)
48-
* macOS 14+ arm64
48+
* macOS 15+ arm64
4949

5050
It is not supported on any arm64 Linux, Alpine Linux.
5151
Test compatibility by running [silkworm_compat_check.sh](https://github.com/erigontech/erigon/blob/main/turbo/silkworm/silkworm_compat_check.sh)
@@ -92,7 +92,7 @@ git submodule update --init --recursive
9292

9393
Building Silkworm requires:
9494
* C++20 compiler: [GCC](https://www.gnu.org/software/gcc/) >= 11.2 or [Clang](https://clang.llvm.org/) >= 16
95-
or AppleClang ([Xcode](https://developer.apple.com/xcode/) >= 15)
95+
or AppleClang ([Xcode](https://developer.apple.com/xcode/) >= 16)
9696
* [CMake](https://cmake.org)
9797
* [Conan](https://conan.io)
9898

cmake/toolchain/cxx20.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ cmake_policy(SET CMP0063 NEW)
1313
cmake_policy(SET CMP0074 NEW)
1414

1515
set(CMAKE_OSX_DEPLOYMENT_TARGET
16-
"14.0"
16+
"15.0"
1717
CACHE STRING ""
1818
)

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def configure_boost(self):
5858
self.options['boost'].asio_no_deprecated = True
5959

6060
if self.settings.os == 'Macos':
61-
cmake_osx_deployment_target = '10.14'
61+
cmake_osx_deployment_target = '15.0'
6262
os_version_min_flag = f'-mmacosx-version-min={cmake_osx_deployment_target}'
6363
self.options['boost'].extra_b2_flags = f'cxxflags="{os_version_min_flag}" linkflags="{os_version_min_flag}"'
6464

silkworm/capi/cli/sample-go-client/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ go run main.go
1313

1414
on macOS:
1515
```bash
16-
CGO_LDFLAGS=-mmacosx-version-min=14.0 go run main.go
16+
CGO_LDFLAGS=-mmacosx-version-min=15.0 go run main.go
1717
```

0 commit comments

Comments
 (0)