ci: always set values for command line defines #5126
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
lrstewart
force-pushed
the
define_paranoia
branch
2 times, most recently
from
c1bcbbc to
cbe7507
Compare
goatgoose
approved these changes
Feb 19, 2025
dougch
approved these changes
Feb 19, 2025
| @@ -134,7 +134,7 @@ bindir ?= $(exec_prefix)/bin | |||
| libdir ?= $(exec_prefix)/lib64 | |||
| includedir ?= $(exec_prefix)/include | |||
|
|
|||
| feature_probe = $(shell $(CC) $(CFLAGS) $(shell cat $(S2N_ROOT)/tests/features/GLOBAL.flags) $(shell cat $(S2N_ROOT)/tests/features/$(1).flags) -c -o tmp.o $(S2N_ROOT)/tests/features/$(1).c > /dev/null 2>&1 && echo "-D$(1)"; rm tmp.o > /dev/null 2>&1) | |||
| feature_probe = $(shell $(CC) $(CFLAGS) $(shell cat $(S2N_ROOT)/tests/features/GLOBAL.flags) $(shell cat $(S2N_ROOT)/tests/features/$(1).flags) -c -o tmp.o $(S2N_ROOT)/tests/features/$(1).c > /dev/null 2>&1 && echo "-D$(1)=1"; rm tmp.o > /dev/null 2>&1) | |||
There was a problem hiding this comment.
It can cease to exist if we finish the cmake migration ;)
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
lrstewart
force-pushed
the
define_paranoia
branch
from
60f2430 to
cd97824
Compare
goatgoose
approved these changes
Feb 20, 2025
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.
Release Summary:
Resolved issues:
resolves #5116 (comment)
Description of changes:
gcc, clang, and every compiler on godbolt that I could test with set any command-line define to 1 by default. But that's apparently not part of any spec, so a compiler could theoretically do something different. It's also arguably "magical" behavior: without reading the right clang or gcc documentation, it's unclear that it's happening.
I'm thinking that it would be clearer to just explicitly set defines to 1.
It's also technically safer, but honestly probably not that much safer. While I was trying to find any sort of spec, I found this memorable quote: "The C Standard does not mandate this behavior but it would take a perverse compiler to not mimic the original pcc as all others have for 40 years including gcc and clang." The "perverse" compiler would also have to specifically use "0" as its default, because any non-0 value would work just fine in any #ifs and just not setting any value at all would cause compilation of any #ifs to fail.
Testing:
The script passes for the updated CMakeLists.txt.
The script fails for the old CMakeLists.txt with: https://github.com/lrstewart/s2n/actions/runs/13402258346/job/37435368302?pr=61
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.