build: add s2n_prelude.h to consolidate defines #4465
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
camshaft
force-pushed
the
camshaft/prelude
branch
from
e7e88ff
to
1c586b2
Compare
|
This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. |
camshaft
force-pushed
the
camshaft/prelude
branch
2 times, most recently
from
bda4405
to
4e2083d
Compare
goatgoose
reviewed
Aug 28, 2024
camshaft
force-pushed
the
camshaft/prelude
branch
from
4e2083d
to
ba9cd03
Compare
goatgoose
approved these changes
Aug 28, 2024
|
This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. |
camshaft
force-pushed
the
camshaft/prelude
branch
from
51411b8
to
177519e
Compare
lrstewart
reviewed
Oct 28, 2024
Comment on lines
+195
to
196
| target_compile_options(${PROJECT_NAME} PUBLIC -fPIC -include "${CMAKE_CURRENT_LIST_DIR}/utils/s2n_prelude.h") | ||
|
|
There was a problem hiding this comment.
What happens if we accidentally remove this "include"? Does it fail loudly?
And as discussed offline, maybe an assert or a test would give a nice clear failure.
lrstewart
approved these changes
Oct 28, 2024
lrstewart
approved these changes
Oct 28, 2024
graebm
reviewed
Nov 6, 2024
| @@ -192,11 +192,12 @@ if(S2N_BLOCK_NONPORTABLE_OPTIMIZATIONS) | |||
| target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_BLOCK_NONPORTABLE_OPTIMIZATIONS=1) | |||
| endif() | |||
|
|
|||
| target_compile_options(${PROJECT_NAME} PUBLIC -fPIC) | |||
| target_compile_options(${PROJECT_NAME} PUBLIC -fPIC -include "${CMAKE_CURRENT_LIST_DIR}/utils/s2n_prelude.h") | |||
There was a problem hiding this comment.
Should it be like this:
Suggested change
| target_compile_options(${PROJECT_NAME} PUBLIC -fPIC -include "${CMAKE_CURRENT_LIST_DIR}/utils/s2n_prelude.h") | |
| target_compile_options(${PROJECT_NAME} PUBLIC -fPIC) | |
| target_compile_options(${PROJECT_NAME} PRIVATE -include "${CMAKE_CURRENT_LIST_DIR}/utils/s2n_prelude.h") |
By making this PUBLIC, any project that depends, directly or indirectly, on S2N gets this compile option added to all their .c/.cpp files
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.
Description of changes:
This change adds a
s2n_prelude.hthat is included as part of every file on compilation. This aims to simplify/consolidate the project-wide defines, includingS2N_API,_POSIX_C_SOURCE,_GNU_SOURCE, and_FORTIFY_SOURCE.Call-outs:
I fixed a few related issues as part of this change
s2n_fork_detection.c. This caused a mismatch in behavior on OpenBSD. To make this easier to maintain, I moved all of the include/setup intos2n_fork_detection_internal.h.s2n-tls-sysrust crate, we were keying onPROFILE == releaseinstead ofOPT_LEVEL > 0to enable fortify source. As noted in the cargo documention, OPT_LEVEL is more correct, since workspaces can create different profiles outside ofrelease.Testing:
Since this is a build change, all of the existing tests show it working as expected.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.