diff options
author | 2017-05-12 17:10:13 +0200 | |
---|---|---|
committer | 2017-05-12 17:10:13 +0200 | |
commit | d69f776c4d0f902ac38708cffb2e7be23b792ff7 (patch) | |
tree | 0d1c8fea13c96180270e375caaddc97f00cd507c /bazel/grpc_build_system.bzl | |
parent | ae79a008765a3f9b216f6ece704dc28b80455ade (diff) |
Merge failure - add new linkshared argument.
Diffstat (limited to 'bazel/grpc_build_system.bzl')
-rw-r--r-- | bazel/grpc_build_system.bzl | 3 |
1 files changed, 2 insertions, 1 deletions
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"], |