Skip to content
Snippets Groups Projects
Commit d69f776c authored by Nicolas "Pixel" Noble's avatar Nicolas "Pixel" Noble
Browse files

Merge failure - add new linkshared argument.

parent ae79a008
No related branches found
No related tags found
No related merge requests found
...@@ -100,7 +100,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data ...@@ -100,7 +100,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
linkopts = ["-pthread"], 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 = [] copts = []
if language.upper() == "C": if language.upper() == "C":
copts = ["-std=c99"] copts = ["-std=c99"]
...@@ -110,6 +110,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da ...@@ -110,6 +110,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da
args = args, args = args,
data = data, data = data,
testonly = testonly, testonly = testonly,
linkshared = linkshared,
deps = deps + ["//external:" + dep for dep in external_deps], deps = deps + ["//external:" + dep for dep in external_deps],
copts = copts, copts = copts,
linkopts = ["-pthread"], linkopts = ["-pthread"],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment