Skip to content

Fix Windows & Darwin cross-compilation to Linux when using gRPC #1876

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.

Sign up for GitHub

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
jayconrod merged 1 commit into from
Jan 3, 2019
Merged

Fix Windows & Darwin cross-compilation to Linux when using gRPC #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 go/private/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def go_rules_dependencies():
commit = "8dea3dc473e90c8179e519d91302d0597c0ca1d1", # v1.15.0, latest as of 2018-09-28
patches = [
"@io_bazel_rules_go//third_party:org_golang_google_grpc-gazelle.patch",
"@io_bazel_rules_go//third_party:org_golang_google_grpc-android.patch",
"@io_bazel_rules_go//third_party:org_golang_google_grpc-crosscompile.patch",
],
patch_args = ["-p1"],
# gazelle args: -go_prefix google.golang.org/grpc -proto disable
Expand Down
10 changes: 8 additions & 2 deletions ...arty/org_golang_google_grpc-android.patch → ...org_golang_google_grpc-crosscompile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
diff -urN b/internal/channelz/BUILD.bazel c/internal/channelz/BUILD.bazel
--- b/internal/channelz/BUILD.bazel 2018-09-27 16:55:16.110787059 -0400
+++ c/internal/channelz/BUILD.bazel 2018-09-27 16:55:54.851285539 -0400
@@ -17,6 +17,9 @@
@@ -17,6 +17,15 @@
"//credentials:go_default_library",
"//grpclog:go_default_library",
] + select({
+ "@io_bazel_rules_go//go/platform:darwin": [
+ "@org_golang_x_sys//unix:go_default_library",
+ ],
+ "@io_bazel_rules_go//go/platform:windows": [
+ "@org_golang_x_sys//unix:go_default_library",
+ ],
+ "@io_bazel_rules_go//go/platform:android": [
+ "@org_golang_x_sys//unix:go_default_library",
+ ],
"@io_bazel_rules_go//go/platform:linux": [
"@org_golang_x_sys//unix:go_default_library",
],
@@ -29,6 +32,9 @@
@@ -29,6 +38,9 @@
srcs = ["util_test.go"],
embed = [":go_default_library"],
deps = select({
Expand Down