Make builds with musl on glibc systems possible
#3263
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
Prior to this commit building with a toolchain based on `musl` in a `glibc` distribution (like ubuntu) would result in an error. For these environments `execinfo.h` is not available because `musl` doesn't include it and these distributions don't package `libexecinfo` resulting in an error. This commit changes things to allow the builds to succeed by ensuring that the `socket.c` includes are only used if the `__GLIBC__` macro is defined. It also updates `ponyassert.c` to work around the lack of `execinfo.h` by `ifdef`'ing out the call to `backtrace` resulting in a binary that compiles but is not able to print a stacktrace on an assertion.
SeanTAllen
reviewed
Jul 29, 2019
| @@ -55,7 +58,9 @@ void ponyint_assert_fail(const char* expr, const char* file, size_t line, | |||
| "imprecise or incorrect.\nUse a debug version to get more meaningful " | |||
| "information.\n", stderr); | |||
| } | |||
|
|
|||
| #else | |||
| fputs("Backtrace functionality not available.\n", stderr); | |||
There was a problem hiding this comment.
This is the only bit I'm not sure about. Do we want this message?
Marking as "Needs discussion during sync" to get others input. Otherwise this looks good to me.
|
I feel like this one should have a CHANGELOG entry. @jemc any objection to a changelog entry for this? |
|
@dipinhora can you add a CHANGELOG entry and then we can merge. |
|
done |
|
Thanks @dipinhora! |
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.
Prior to this commit building with a toolchain based on
muslin a
glibcdistribution (like ubuntu) would result in an error.For these environments
execinfo.his not available becausemusldoesn't include it and these distributions don't packagelibexecinforesulting in an error.This commit changes things to allow the builds to succeed by
ensuring that the
socket.cincludes are only used if the__GLIBC__macro is defined. It also updatesponyassert.ctowork around the lack of
execinfo.hbyifdef'ing out thecall to
backtraceresulting in a binary that compiles but isnot able to print a stacktrace on an assertion.