Skip to content

Commit 555b5d1

Browse files
committed
Merge bitcoin#20419: build: set minimum supported macOS to 10.14
a52ecc9 build: set minimum supported macOS to 10.14 (fanquake) Pull request description: This is a requirement for C++17 support. See my comments [here](bitcoin#16684 (comment)): > You cannot use std::get with std::variant on macOS < 10.14, because Apples libc++ doesn't support the std::bad_variant_access exception. [Relevant comment](bitcoin#19183 (comment)) in bitcoin#19183. > While we could work around this in our own code, using std::get_if, this would still be a problem for 3rd-party dependencies. > I've been testing Qt 5.15LTS (we'll have to enable C++17 in qt, and may upgrade to a newer version at the same time), and you can't enable -std c++17, while targeting a macOS deployment version < 10.14, configuring will fail. They are making use of std::get with std::variant throughout their cocoa code. We would have to had to have bumped to at least 10.13 in any case, as Qt 5.15 (bitcoin#19716) [requires 10.13+](https://doc.qt.io/qt-5/supported-platforms.html). ACKs for top commit: hebasto: ACK a52ecc9, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: f669b2fc777aeea1e9afdbbc7bd9afe3997418211db6ba53c934cae0e62a9b999603da539518c229f34961d275c9e2f315c7b022cf5fb97bd201a69c85d470cc
2 parents b0c9024 + a52ecc9 commit 555b5d1

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ task:
122122
FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
123123

124124
task:
125-
name: 'macOS 10.12 [GOAL: deploy] [no functional tests]'
125+
name: 'macOS 10.14 [GOAL: deploy] [no functional tests]'
126126
<< : *GLOBAL_TASK_TEMPLATE
127127
container:
128128
image: ubuntu:bionic

ci/test/00_setup_env_mac.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
1010
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to macos (bionic is used in the gitian build as well)
11-
export HOST=x86_64-apple-darwin16
11+
export HOST=x86_64-apple-darwin18
1212
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools"
1313
export XCODE_VERSION=11.3.1
1414
export XCODE_BUILD_ID=11C505

ci/test/00_setup_env_mac_host.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-apple-darwin16
9+
export HOST=x86_64-apple-darwin18
1010
export PIP_PACKAGES="zmq"
1111
export GOAL="install"
1212
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process"

contrib/gitian-descriptors/gitian-osx.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ script: |
3737
set -e -o pipefail
3838
3939
WRAP_DIR=$HOME/wrapped
40-
HOSTS="x86_64-apple-darwin16"
40+
HOSTS="x86_64-apple-darwin18"
4141
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"
4242
FAKETIME_HOST_PROGS=""
4343
FAKETIME_PROGS="ar ranlib date dmg genisoimage"

depends/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Common `host-platform-triplets` for cross compilation are:
2525
- `i686-pc-linux-gnu` for Linux 32 bit
2626
- `x86_64-pc-linux-gnu` for x86 Linux
2727
- `x86_64-w64-mingw32` for Win64
28-
- `x86_64-apple-darwin16` for macOS
28+
- `x86_64-apple-darwin18` for macOS
2929
- `arm-linux-gnueabihf` for Linux ARM 32 bit
3030
- `aarch64-linux-gnu` for Linux ARM 64 bit
3131
- `powerpc64-linux-gnu` for Linux POWER 64-bit (big endian)

depends/hosts/darwin.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OSX_MIN_VERSION=10.12
1+
OSX_MIN_VERSION=10.14
22
OSX_SDK_VERSION=10.15.1
33
XCODE_VERSION=11.3.1
44
XCODE_BUILD_ID=11C505

doc/build-osx.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,6 @@ tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log
111111
```
112112

113113
## Notes
114-
* Tested on OS X 10.12 Sierra through macOS 10.15 Catalina on 64-bit Intel
114+
* Tested on OS X 10.14 Mojave through macOS 11 Big Sur on 64-bit Intel
115115
processors only.
116116
* Building with downloaded Qt binaries is not officially supported. See the notes in [#7714](https://github.com/bitcoin/bitcoin/issues/7714).

doc/release-notes.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ Compatibility
4646
==============
4747

4848
Bitcoin Core is supported and extensively tested on operating systems
49-
using the Linux kernel, macOS 10.12+, and Windows 7 and newer. Bitcoin
49+
using the Linux kernel, macOS 10.14+, and Windows 7 and newer. Bitcoin
5050
Core should also work on most other Unix-like systems but is not as
5151
frequently tested on them. It is not recommended to use Bitcoin Core on
5252
unsupported systems.
5353

54-
From Bitcoin Core 0.20.0 onwards, macOS versions earlier than 10.12 are no
54+
From Bitcoin Core 0.22.0 onwards, macOS versions earlier than 10.14 are no
5555
longer supported. Additionally, Bitcoin Core does not yet change appearance
5656
when macOS "dark mode" is activated.
5757

share/qt/Info.plist.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="0.9">
44
<dict>
55
<key>LSMinimumSystemVersion</key>
6-
<string>10.12.0</string>
6+
<string>10.14.0</string>
77

88
<key>LSArchitecturePriority</key>
99
<array>

0 commit comments

Comments
 (0)