mirror of
https://github.com/zebrajr/tensorflow.git
synced 2025-12-06 12:20:11 +01:00
This PR updates Tensorflow to change protobuf's cc_library //third_party/protobuf:protobuf to include alwayslink = 1.
This is needed because tensorflow_framework.so currently defines the symbols provided by //third_party/protobuf:protobuf. Incompatible change bazelbuild/bazel#7362 is going to be flipped in Bazel 1.0. and is going to disable --legacy_whole_archive that was enabled by default and that caused every transitive cc_library linked into a transitive shared library to be linked in a whole-archive block. Putting alwayslink = 1 recreates the behavior from before the flag flip. The principled solution is to talk to the protobuf team and ask them to maintain a cc_library with alwayslink = 1 target that projects such as TF can depend on. This PR is a fast-fix for Bazel 1.0. And maybe we'll discover that those symbols shouldn't be defined by the protobuf_tensorflow.so at all and instead //third_party/protobuf:protobuf should be a dependency of executables using those symbols. PiperOrigin-RevId: 266779761
This commit is contained in:
parent
3fde8be393
commit
2d2d6cffbd
11
third_party/protobuf/protobuf.patch
vendored
11
third_party/protobuf/protobuf.patch
vendored
|
|
@ -11,7 +11,15 @@ index 2fb26050..c2744d5b 100644
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Protobuf Runtime Library
|
# Protobuf Runtime Library
|
||||||
@@ -218,7 +218,7 @@ cc_library(
|
@@ -209,6 +209,7 @@ cc_library(
|
||||||
|
copts = COPTS,
|
||||||
|
includes = ["src/"],
|
||||||
|
linkopts = LINK_OPTS,
|
||||||
|
+ alwayslink = 1,
|
||||||
|
visibility = ["//visibility:public"],
|
||||||
|
deps = [":protobuf_lite"] + PROTOBUF_DEPS,
|
||||||
|
)
|
||||||
|
@@ -219,7 +220,7 @@ cc_library(
|
||||||
# TODO(keveman): Remove this target once the support gets added to Bazel.
|
# TODO(keveman): Remove this target once the support gets added to Bazel.
|
||||||
cc_library(
|
cc_library(
|
||||||
name = "protobuf_headers",
|
name = "protobuf_headers",
|
||||||
|
|
@ -20,3 +28,4 @@ index 2fb26050..c2744d5b 100644
|
||||||
includes = ["src/"],
|
includes = ["src/"],
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
)
|
)
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user