Build the secp256k1 C files separately
#23
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
Simplify the `main` function a little by moving out some code.
Move some more code out from the `main` function to keep it easier to read. Also renamed the function so that it better conveys that it's a check returning a `bool`.
Make setting them more consistent.
A helper function to configure the build's language standard and to automatically enable or disable C++ support. This allows moving some more code out of `main`, but it is also preparing for running more than one build, for splitting the `secp256k1` library.
This just moves the code that configures the build for `secp256k1p`, but the plan is to have this function perform an independent build.
Remove the current Clang warning about compiling C code using C++ mode, and also avoid errors in the future when the `zcash` dependency is updated.
jvff
force-pushed
the
split-off-secp256k1-build
branch
from
bb3eb45
to
357a889
Compare
teor2345
reviewed
Jul 15, 2021
teor2345
reviewed
Jul 15, 2021
| .include("depend/zcash/src/secp256k1") | ||
| // Some ecmult stuff is defined but not used upstream | ||
| .flag_if_supported("-Wno-unused-function") | ||
| .flag_if_supported("-Wno-unused-parameter"); |
There was a problem hiding this comment.
Do we need /wd4100 here as well?
There was a problem hiding this comment.
I don't think so. At least there wasn't anything from CI 🤷♂️
teor2345
reviewed
Jul 15, 2021
There was a problem hiding this comment.
This looks good to me, but I'd like @oxarbitrage to do the final check.
Make it easy to understand what it is without having the reader to look it up. Co-authored-by: teor <teor@riseup.net>
oxarbitrage
approved these changes
Jul 15, 2021
3 tasks
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.
Clang currently warns that building C files using C++ mode is deprecated. This happens because the
secp256k1C files are built together with the C++ files. This will get worse in the future because when updating thezcashdependency, the C files will lead to compiler errors due to subtle language version differences.This PR solves both issues by building the
secp245k1C files separately from the other Zcash C++ files. The resultinglibsecp256k1.aandlibzcash_script.abinaries are then available to be linked into the final Rust binary.The PR also includes a few refactors to make the
mainfunction more concise and easier to read and update.