diff --git a/native_client/BUILD b/native_client/BUILD
index a13c6d8fbb..faf6f379bf 100644
--- a/native_client/BUILD
+++ b/native_client/BUILD
@@ -51,12 +51,28 @@ tf_cc_shared_object(
     copts = ["-Wno-sign-compare", "-fvisibility=hidden"],
     linkopts = select({
         "//tensorflow:darwin": [],
-        "//conditions:default": [
-            "-ldl",
-            "-pthread",
-            "-Wl,-Bsymbolic",
-            "-Wl,-Bsymbolic-functions",
-            "-Wl,-export-dynamic",
+        "//tensorflow:linux_x86_64": [
+                "-ldl",
+                "-pthread",
+                "-Wl,-Bsymbolic",
+                "-Wl,-Bsymbolic-functions",
+                "-Wl,-export-dynamic",
+        ],
+        "//tensorflow:rpi3": [
+                "-ldl",
+                "-pthread",
+                "-Wl,-Bsymbolic",
+                "-Wl,-Bsymbolic-functions",
+                "-Wl,-export-dynamic",
+                "-l:libstdc++.a",
+        ],
+        "//tensorflow:rpi3-armv8": [
+                "-ldl",
+                "-pthread",
+                "-Wl,-Bsymbolic",
+                "-Wl,-Bsymbolic-functions",
+                "-Wl,-export-dynamic",
+                "-l:libstdc++.a",
         ],
     }),
     deps = [