diff --git a/cmake/platforms/OSX.cmake b/cmake/platforms/OSX.cmake --- a/cmake/platforms/OSX.cmake +++ b/cmake/platforms/OSX.cmake @@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Darwin) set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(TOOLCHAIN_PREFIX ${CMAKE_SYSTEM_PROCESSOR}-apple-darwin18) +set(TOOLCHAIN_PREFIX ${CMAKE_SYSTEM_PROCESSOR}-apple-darwin19) # Set Corrosion Rust target set(Rust_CARGO_TARGET "x86_64-apple-darwin") diff --git a/contrib/devtools/build_cmake.sh b/contrib/devtools/build_cmake.sh --- a/contrib/devtools/build_cmake.sh +++ b/contrib/devtools/build_cmake.sh @@ -77,7 +77,7 @@ # If cross building for OSX, the python library needs to be added to the python # library path. -export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin18/native/lib/python3/dist-packages:${PYTHONPATH:-}" +export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin19/native/lib/python3/dist-packages:${PYTHONPATH:-}" cmake -GNinja "${TOPLEVEL}" "${CMAKE_FLAGS[@]}" diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -218,7 +218,7 @@ def check_MACHO_min_os(filename) -> bool: binary = lief.parse(filename) - return binary.build_version.minos == [10, 14, 0] + return binary.build_version.minos == [10, 15, 0] def check_MACHO_sdk(filename) -> bool: diff --git a/contrib/devtools/test-symbol-check.py b/contrib/devtools/test-symbol-check.py --- a/contrib/devtools/test-symbol-check.py +++ b/contrib/devtools/test-symbol-check.py @@ -141,7 +141,7 @@ self.assertEqual(call_symbol_check(cc, source, executable, ['-Wl,-platform_version', '-Wl,macos', - '-Wl,10.14', '-Wl,11.4']), + '-Wl,10.15', '-Wl,11.4']), (1, f'{executable}: failed SDK')) def test_PE(self): diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -40,12 +40,12 @@ script: | WRAP_DIR=$HOME/wrapped HOSTS=( - x86_64-apple-darwin18 + x86_64-apple-darwin19 ) # CMake toolchain file name differ from host name declare -A CMAKE_TOOLCHAIN_FILE - CMAKE_TOOLCHAIN_FILE[x86_64-apple-darwin18]=OSX.cmake + CMAKE_TOOLCHAIN_FILE[x86_64-apple-darwin19]=OSX.cmake FAKETIME_HOST_PROGS="" FAKETIME_PROGS="ar ranlib date dmg xorrisofs" diff --git a/contrib/guix/README.md b/contrib/guix/README.md --- a/contrib/guix/README.md +++ b/contrib/guix/README.md @@ -64,7 +64,6 @@ ./contrib/guix/guix-build ``` - ## Cleaning intermediate work directories By default, `guix-build` leaves all intermediate files or "work directories" diff --git a/contrib/teamcity/build-configurations.yml b/contrib/teamcity/build-configurations.yml --- a/contrib/teamcity/build-configurations.yml +++ b/contrib/teamcity/build-configurations.yml @@ -368,7 +368,7 @@ - install-secp256k1 - install-tests post_build: | - export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin18/native/lib/python3/dist-packages:${PYTHONPATH:-}" + export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin19/native/lib/python3/dist-packages:${PYTHONPATH:-}" ninja osx-dmg timeout: 3600 artifacts: diff --git a/depends/Makefile b/depends/Makefile --- a/depends/Makefile +++ b/depends/Makefile @@ -215,7 +215,7 @@ download-one: check-sources $(all_sources) download-osx: - @$(MAKE) -s HOST=x86_64-apple-darwin18 download-one + @$(MAKE) -s HOST=x86_64-apple-darwin19 download-one download-linux: @$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one download-win: @@ -231,7 +231,7 @@ build-linux-aarch64: download-linux @$(MAKE) -s HOST=aarch64-linux-gnu install build-osx: download-osx - @$(MAKE) -s HOST=x86_64-apple-darwin18 install + @$(MAKE) -s HOST=x86_64-apple-darwin19 install build-win64: download-win @$(MAKE) -s HOST=x86_64-w64-mingw32 install diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -1,4 +1,4 @@ -OSX_MIN_VERSION=10.14 +OSX_MIN_VERSION=10.15 OSX_SDK_VERSION=10.15.1 XCODE_VERSION=11.3.1 XCODE_BUILD_ID=11C505 diff --git a/doc/release-notes.md b/doc/release-notes.md --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -5,4 +5,4 @@ This release includes the following features and fixes: - - From this version onwards, macOS versions earlier than 10.14 are no longer supported. + - From this version onwards, macOS versions earlier than 10.15 are no longer supported.