From d69f776c4d0f902ac38708cffb2e7be23b792ff7 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Fri, 12 May 2017 17:10:13 +0200
Subject: [PATCH] Merge failure - add new linkshared argument.
---
bazel/grpc_build_system.bzl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index a287e8f525..4a50cb51fe 100644
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@@ -100,7 +100,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
linkopts = ["-pthread"],
)
-def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False):
+def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False):
copts = []
if language.upper() == "C":
copts = ["-std=c99"]
@@ -110,6 +110,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da
args = args,
data = data,
testonly = testonly,
+ linkshared = linkshared,
deps = deps + ["//external:" + dep for dep in external_deps],
copts = copts,
linkopts = ["-pthread"],
--
GitLab