diff --git a/tensorflow/BUILD b/tensorflow/BUILD index e6f5bc56b7b..f000821983b 100644 --- a/tensorflow/BUILD +++ b/tensorflow/BUILD @@ -1172,7 +1172,6 @@ tf_cc_shared_library( ], "//conditions:default": [ "-Wl,--version-script,$(location //tensorflow:tf_framework_version_script.lds)", - "-Wl,-Bsymbolic-functions", # copybara:uncomment_begin(google-only) # "-Wl,--undefined-version", # copybara:uncomment_end(google-only) @@ -1321,7 +1320,6 @@ tf_cc_shared_library( "//conditions:default": [ "-Wl,-z,defs", "-Wl,--version-script,$(location //tensorflow:tf_version_script.lds)", - "-Wl,-Bsymbolic-functions", ], }), per_os_targets = True, @@ -1587,7 +1585,6 @@ exports_files( "tf_version_script.lds", "tf_exported_symbols.lds", "tf_private_symbols.lds", - "tf_framework_version_script.lds", ], ) diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD index 99cac4d62db..84547ebf0b9 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -1566,7 +1566,6 @@ pywrap_library( "-lpthread", "-ldl", "-lm", - "-Wl,-Bsymbolic-functions", ], }), "tensorflow/tensorflow_cc": select({ @@ -1587,18 +1586,12 @@ pywrap_library( "-lpthread", "-ldl", "-lm", - "-Wl,-Bsymbolic-functions", ], }), }, # buildifier: disable=unsorted-dict-items # @unsorted-dict-items common_lib_version_scripts = { - "tensorflow/tensorflow_framework": select({ - "//tensorflow:windows": None, - "//tensorflow:macos": None, - "//conditions:default": "//tensorflow:tf_framework_version_script.lds", - }), "tensorflow/tensorflow_cc": select({ "//tensorflow:windows": None, "//tensorflow:macos": "//tensorflow:tf_exported_symbols.lds", diff --git a/tensorflow/tf_framework_version_script.lds b/tensorflow/tf_framework_version_script.lds index a95f97d996e..3e0dca3e587 100644 --- a/tensorflow/tf_framework_version_script.lds +++ b/tensorflow/tf_framework_version_script.lds @@ -1,4 +1,5 @@ -tensorflow { - global: - *; +VERS_1.0 { + # Hide libjpeg symbols to avoid symbol conflict with OpenCV + local: + *mlir*; };