-
Notifications
You must be signed in to change notification settings - Fork 736
bazel: make build byte-for-byte reproducible #30187
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| diff --git a/util/mkbuildinf.pl b/util/mkbuildinf.pl | ||
| index abcdef1..1234567 100644 | ||
| --- a/util/mkbuildinf.pl | ||
| +++ b/util/mkbuildinf.pl | ||
| @@ -11,6 +11,16 @@ use warnings; | ||
| my $platform = pop @ARGV; | ||
| my $cflags = join(' ', @ARGV); | ||
| $cflags =~ s(\\)(\\\\)g; | ||
| + | ||
| +# Strip sandbox/build-root absolute paths so the output is reproducible | ||
| +# across different Bazel output bases and sandbox instances. Note: the | ||
| +# cflags modified here are only embedded as a diagnostic string (shown by | ||
| +# `openssl version -a`), not used for actual compilation. | ||
| +my $ebr = $ENV{'EXT_BUILD_ROOT'} // ''; | ||
| +if ($ebr ne '') { | ||
| + $cflags =~ s/\Q$ebr\E\/?/./g; | ||
| +} | ||
| + | ||
| $cflags = "compiler: $cflags"; | ||
|
|
||
| # Use the value of the envvar SOURCE_DATE_EPOCH, even if it's | ||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this feels sort of sketchy 😀
I suppose our alternatives are to use the bazel build for openssl is undesirable for other reasons? I am not sure if there is a way to achieve this without the regex replace... Do you know what cflags in practice have the build root embedded?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to be clear, since this also sketched me out, I checked and this "cflags" isn't used for compilation (after this point), it's only used to embed the a copy of cflags in the binary probably for diagnostic output (e.g. so --version can tell you what flags you compiled with).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah a comment to that effect would be helpful TBH
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a comment in the patch clarifying that the modified cflags are only embedded as a diagnostic string (shown by
openssl version -a), not used for compilation.