Update OSX CI and other dependencies #536
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes #6006, #6296
@daira identified an error in zeromq/libzmq#4494 that we reproduced in zcash/zcash#6393. This adds @daira's patch from zeromq/libzmq#4507 to ensure we handle this potential case of undefined behavior. Co-authored-by: Daira Hopwood <[email protected]>
This is needed to fix the CI on recent OSX systems. For reference, see rust-lang/cargo#8603.
Instead of compiling ourselves the build tools needed (e.g. cmake, autotools), check that such tools are available in the given image and use those.
In addition to removing an unnecessary dependency on boost, this also helps fixing compilation errors with recent gtest.
This commit also fixes inconsistencies in the compilation flags for different static libraries used in the same output binary.
ptagl
approved these changes
Apr 13, 2023
a-petrini
approved these changes
Apr 13, 2023
drgora
force-pushed
the
dr/fix_mac_compilation
branch
from
5e96b64 to
c3756ee
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The main goal of this PR is to fix compilation on/for recent macOS versions, which becomes necessary after Boost update to version 1.81.
macOS binaries compiled after this PR only will be compatible with macOS version 10.14 (
Mojave) or newer.In order to achieve such a goal, we:
xcode12.3image, which includes macOS 11.1 and Xcode 12.3This PR also includes a number of other improvements. Specifically, we:
zencash-applerepository altogether, since now the prefer the build tools provided by travis imagesboost::optionaltostd::optional(fixing errors with recent gtest)Make-O3optimization level for all release builds (linux, mingw, and osx)