Merge pull request tensorflow#122 from lissyx/fix-linker2

Fix tensorflow#3207: do not force -shared on the linkage
coqui-ai · Aug 3, 2020 · 1c1b2b9 · 1c1b2b9
2 parents 6f73d77 + d124566
commit 1c1b2b9
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/tensorflow/lite/c/BUILD b/tensorflow/lite/c/BUILD
@@ -26,6 +26,7 @@ tflite_cc_shared_object(
             "-Wl,-exported_symbols_list,$(location //tensorflow/lite/c:exported_symbols.lds)",
         ],
         "//tensorflow:windows": [],
+        "//tensorflow:ios": [],
         "//conditions:default": [
             "-z defs",
             "-Wl,--version-script,$(location //tensorflow/lite/c:version_script.lds)",

diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
@@ -613,6 +613,9 @@ def tf_cc_shared_object(
                     "-Wl,-install_name,@rpath/" + soname,
                 ],
                 clean_dep("//tensorflow:windows"): [],
+                clean_dep("//tensorflow:ios"): [
+                    "-Wl,-install_name,@rpath/" + soname
+                ],
                 "//conditions:default": [
                     "-Wl,-soname," + soname,
                 ],

diff --git a/tools/arm_compiler/linaro-gcc72-aarch64/linaro_toolchain_config.bzl b/tools/arm_compiler/linaro-gcc72-aarch64/linaro_toolchain_config.bzl
@@ -150,6 +150,21 @@ def _impl(ctx):
         ],
     )
 
+    shared_flag_feature = feature(
+        name = "shared_flag",
+        flag_sets = [
+            flag_set(
+                actions = [
+                    ACTION_NAMES.cpp_link_dynamic_library,
+                    ACTION_NAMES.cpp_link_nodeps_dynamic_library,
+                    ACTION_NAMES.lto_index_for_dynamic_library,
+                    ACTION_NAMES.lto_index_for_nodeps_dynamic_library,
+                ],
+                flag_groups = [flag_group(flags = ["-shared"])],
+            ),
+        ],
+    )
+
     sysroot_feature = feature(
         name = "sysroot",
         enabled = True,
@@ -380,7 +395,6 @@ def _impl(ctx):
     			    "-Lexternal/LinaroAarch64Gcc72/aarch64-linux-gnu/libc/lib",
     			    "-Lexternal/LinaroAarch64Gcc72/aarch64-linux-gnu/libc/usr/lib",
     			    "-Bexternal/LinaroAarch64Gcc72/aarch64-linux-gnu/bin",
-			    "-shared",
                         ],
                     ),
                 ],
@@ -407,6 +421,7 @@ def _impl(ctx):
 	dbg_feature,
 	user_compile_flags_feature,
 	user_link_flags_feature,
+	shared_flag_feature,
 	sysroot_feature,
 	unfiltered_compile_flags_feature,
     ]

diff --git a/tools/arm_compiler/linaro-gcc72-armeabi/linaro_toolchain_config.bzl b/tools/arm_compiler/linaro-gcc72-armeabi/linaro_toolchain_config.bzl
@@ -150,6 +150,21 @@ def _impl(ctx):
         ],
     )
 
+    shared_flag_feature = feature(
+        name = "shared_flag",
+        flag_sets = [
+            flag_set(
+                actions = [
+                    ACTION_NAMES.cpp_link_dynamic_library,
+                    ACTION_NAMES.cpp_link_nodeps_dynamic_library,
+                    ACTION_NAMES.lto_index_for_dynamic_library,
+                    ACTION_NAMES.lto_index_for_nodeps_dynamic_library,
+                ],
+                flag_groups = [flag_group(flags = ["-shared"])],
+            ),
+        ],
+    )
+
     sysroot_feature = feature(
         name = "sysroot",
         enabled = True,
@@ -380,7 +395,6 @@ def _impl(ctx):
     			    "-Lexternal/LinaroArmGcc72/arm-linux-gnueabihf/libc/lib",
     			    "-Lexternal/LinaroArmGcc72/arm-linux-gnueabihf/libc/usr/lib",
     			    "-Bexternal/LinaroArmGcc72/arm-linux-gnueabihf/bin",
-			    "-shared",
                         ],
                     ),
                 ],
@@ -407,6 +421,7 @@ def _impl(ctx):
 	dbg_feature,
 	user_compile_flags_feature,
 	user_link_flags_feature,
+	shared_flag_feature,
 	sysroot_feature,
 	unfiltered_compile_flags_feature,
     ]