diff options
| author |  Lukacs T. Berki <lberki@google.com> | 2016-10-07 14:14:43 +0200 |
|---|---|---|
| committer | Lukacs T. Berki <lberki@google.com> | 2016-10-07 14:16:03 +0200 |
| commit | 415f1fe15c6407806d262976b27e8f9593ab9599 (patch) | |
| tree | 3ae44e502aebe3b900f220458c1e9c353860e1a3 /third_party/grpc | |
| parent | f99a0543f8d97339d32075c7176b79f35be84606 (diff) | |
Patches to compile against musl
This is a partial import of the patch 8ba828096961b72c8eb93f327719c5de8349581c by Steven Dee <steve@smartercode.net>. The patch cannot be imported in one piece because we store the third-party libraries in the Bazel repository separately from the actual source code of Bazel.
Diffstat (limited to 'third_party/grpc')
| -rw-r--r-- | third_party/grpc/grpc.patch | 12 | ||||
| -rw-r--r-- | third_party/grpc/src/core/support/log_linux.c | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/third_party/grpc/grpc.patch b/third_party/grpc/grpc.patch index fc1c224ebd..5bb428f32c 100644 --- a/third_party/grpc/grpc.patch +++ b/third_party/grpc/grpc.patch @@ -120,6 +120,18 @@ index 5e07f82..44b970d 100644 } GPR_ASSERT(addr_len < ~(socklen_t)0); +diff --git a/third_party/grpc/src/core/support/log_linux.c b/third_party/grpc/src/core/support/log_linux.c +index d66b7a3..93a0c1b 100644 +--- a/third_party/grpc/src/core/support/log_linux.c ++++ b/third_party/grpc/src/core/support/log_linux.c +@@ -51,7 +51,6 @@ + #include <stdarg.h> + #include <string.h> + #include <time.h> +-#include <linux/unistd.h> + #include <sys/syscall.h> + #include <unistd.h> + diff --git a/tools/build_rules/genproto.bzl b/tools/build_rules/genproto.bzl index 62284a3..bc76cd1 100644 --- a/tools/build_rules/genproto.bzl diff --git a/third_party/grpc/src/core/support/log_linux.c b/third_party/grpc/src/core/support/log_linux.c index d66b7a3cc0..93a0c1b4c6 100644 --- a/third_party/grpc/src/core/support/log_linux.c +++ b/third_party/grpc/src/core/support/log_linux.c @@ -51,7 +51,6 @@ #include <stdarg.h> #include <string.h> #include <time.h> -#include <linux/unistd.h> #include <sys/syscall.h> #include <unistd.h> |