Skip to content

Commit a43b8e9

Browse files
committed
build: set OSX_MIN_VERSION to 10.15
This is required to use std::filesystem on macOS as support for it only landed in the libc++ dylib shipped with 10.15. See also: https://developer.apple.com/documentation/xcode-release-notes/xcode-11-release-notes Clang now supports the C++17 <filesystem> library for iOS 13, macOS 10.15, watchOS 6, and tvOS 13.
1 parent 87780df commit a43b8e9

File tree

13 files changed

+17
-17
lines changed

13 files changed

+17
-17
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ task:
254254
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
255255

256256
task:
257-
name: 'macOS 10.14 [gui, no tests] [focal]'
257+
name: 'macOS 10.15 [gui, no tests] [focal]'
258258
<< : *DEPENDS_SDK_CACHE_TEMPLATE
259259
<< : *GLOBAL_TASK_TEMPLATE
260260
container:

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
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:20.04 # Check that Focal can cross-compile to macos
11-
export HOST=x86_64-apple-darwin18
11+
export HOST=x86_64-apple-darwin19
1212
export PACKAGES="cmake imagemagick librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-setuptools xorriso"
1313
export XCODE_VERSION=12.1
1414
export XCODE_BUILD_ID=12A7403

ci/test/00_setup_env_mac_host.sh

Lines changed: 1 addition & 1 deletion
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-darwin18
9+
export HOST=x86_64-apple-darwin19
1010
export PIP_PACKAGES="zmq lief"
1111
export GOAL="install"
1212
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports"

contrib/devtools/symbol-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def check_MACHO_libraries(filename) -> bool:
217217

218218
def check_MACHO_min_os(filename) -> bool:
219219
binary = lief.parse(filename)
220-
if binary.build_version.minos == [10,14,0]:
220+
if binary.build_version.minos == [10,15,0]:
221221
return True
222222
return False
223223

contrib/devtools/test-symbol-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def test_MACHO(self):
137137
}
138138
''')
139139

140-
self.assertEqual(call_symbol_check(cc, source, executable, ['-Wl,-platform_version','-Wl,macos', '-Wl,10.14', '-Wl,11.4']),
140+
self.assertEqual(call_symbol_check(cc, source, executable, ['-Wl,-platform_version','-Wl,macos', '-Wl,10.15', '-Wl,11.4']),
141141
(1, f'{executable}: failed SDK'))
142142

143143
def test_PE(self):

contrib/guix/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ crucial differences:
7575

7676
1. Since only Windows and macOS build outputs require codesigning, the `HOSTS`
7777
environment variable will have a sane default value of `x86_64-w64-mingw32
78-
x86_64-apple-darwin18` instead of all the platforms.
78+
x86_64-apple-darwin19` instead of all the platforms.
7979
2. The `guix-codesign` command ***requires*** a `DETACHED_SIGS_REPO` flag.
8080
* _**DETACHED_SIGS_REPO**_
8181

@@ -159,7 +159,7 @@ which case you can override the default list by setting the space-separated
159159
`HOSTS` environment variable:
160160

161161
```sh
162-
env HOSTS='x86_64-w64-mingw32 x86_64-apple-darwin18' ./contrib/guix/guix-build
162+
env HOSTS='x86_64-w64-mingw32 x86_64-apple-darwin19' ./contrib/guix/guix-build
163163
```
164164

165165
See the [recognized environment variables][env-vars-list] section for more
@@ -224,7 +224,7 @@ details.
224224

225225
_(defaults to "x86\_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu
226226
riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
227-
x86\_64-w64-mingw32 x86\_64-apple-darwin18")_
227+
x86\_64-w64-mingw32 x86\_64-apple-darwin19")_
228228

229229
* _**SOURCES_PATH**_
230230

contrib/guix/guix-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mkdir -p "$VERSION_BASE"
7676
# Default to building for all supported HOSTs (overridable by environment)
7777
export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
7878
x86_64-w64-mingw32
79-
x86_64-apple-darwin18}"
79+
x86_64-apple-darwin19}"
8080

8181
# Usage: distsrc_for_host HOST
8282
#

contrib/guix/guix-codesign

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ fi
9191
################
9292

9393
# Default to building for all supported HOSTs (overridable by environment)
94-
export HOSTS="${HOSTS:-x86_64-w64-mingw32 x86_64-apple-darwin18}"
94+
export HOSTS="${HOSTS:-x86_64-w64-mingw32 x86_64-apple-darwin19}"
9595

9696
# Usage: distsrc_for_host HOST
9797
#

contrib/guix/libexec/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ case "$HOST" in
147147
#
148148
# After the native packages in depends are built, the ld wrapper should
149149
# no longer affect our build, as clang would instead reach for
150-
# x86_64-apple-darwin18-ld from cctools
150+
# x86_64-apple-darwin19-ld from cctools
151151
;;
152152
*) export GUIX_LD_WRAPPER_DISABLE_RPATH=yes ;;
153153
esac
@@ -423,8 +423,8 @@ mkdir -p "$DISTSRC"
423423
find "${DISTNAME}" -print0 \
424424
| sort --zero-terminated \
425425
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
426-
| gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin18/osx64}.tar.gz" \
427-
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin18/osx64}.tar.gz" && exit 1 )
426+
| gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin19/osx64}.tar.gz" \
427+
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin19/osx64}.tar.gz" && exit 1 )
428428
;;
429429
esac
430430
) # $DISTSRC/installed

depends/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Common `host-platform-triplet`s for cross compilation are:
2828
- `i686-pc-linux-gnu` for Linux 32 bit
2929
- `x86_64-pc-linux-gnu` for x86 Linux
3030
- `x86_64-w64-mingw32` for Win64
31-
- `x86_64-apple-darwin18` for macOS
31+
- `x86_64-apple-darwin19` for macOS
3232
- `arm-linux-gnueabihf` for Linux ARM 32 bit
3333
- `aarch64-linux-gnu` for Linux ARM 64 bit
3434
- `powerpc64-linux-gnu` for Linux POWER 64-bit (big endian)

0 commit comments

Comments
 (0)