Partially revert #568, fixing mac compilation #580
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
jasnell
approved these changes
Apr 28, 2023
|
LGTM, modulo the description should be 'Partially revert #568' |
fhanau
force-pushed
the
felix/zlib-fix-next
branch
from
25dcf7e to
5c710bb
Compare
fhanau
changed the title
|
Nice catch, I adjusted the title. |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
While #578 pulled in the updated capnproto version which includes zlib compilation fixes, this is still needed in workerd – capnproto defines the zlib compile options in its WORKSPACE file, which is not accessed by workerd.