Skip to content
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

Support building on Alpine Linux musl #620

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws/utils/backtrace/bsd_backtrace.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

#include "backtrace.h"
#include <aws/utils/writer_methods.h>
#include <execinfo.h>
#include <unistd.h>

#ifdef BSD_BACKTRACE
#include <execinfo.h>
namespace aws {
namespace utils {
namespace backtrace {
Expand Down
3 changes: 1 addition & 2 deletions aws/utils/backtrace/gcc_backtrace.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@

#include "backtrace.h"
#include <aws/utils/writer_methods.h>
#include <execinfo.h>
#include <unistd.h>
#include <aws/utils/logging.h>
#include <aws/utils/writer_methods.h>
#include <cstring>
#include <cstdio>

#ifdef LIB_BACKTRACE

#include <execinfo.h>
#include <backtrace.h>

namespace {
Expand Down
5 changes: 2 additions & 3 deletions aws/utils/backtrace/null_backtrace.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@

#include "backtrace.h"
#include <aws/utils/writer_methods.h>
#include <execinfo.h>
#include <unistd.h>

#ifdef NULL_STACKTRACE
#ifdef NULL_BACKTRACE

namespace aws {
namespace utils {
Expand All @@ -36,4 +35,4 @@ void stack_trace_for_signal(int skip, bool /*signaled*/) {
}
}

#endif // NULL_STACKTRACE
#endif // NULL_BACKTRACE
1 change: 0 additions & 1 deletion aws/utils/signal_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "backtrace/backtrace.h"

#include <signal.h>
#include <execinfo.h>
#include <unistd.h>
#include <cstring>
#include <cstdint>
Expand Down
3 changes: 3 additions & 0 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ function find_release_type() {
if [[ $OSTYPE == "linux-gnu" ]]; then
echo "linux-$(uname -m)"
return
elif [[ $OSTYPE == "linux-musl" ]]; then
echo "linux-musl-$(uname -m)"
return
elif [[ $OSTYPE == darwin* ]]; then
echo "osx"
return
Expand Down