From b6b45463fe90c8ffb87aa29aee534f8a88c91660 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 29 Jun 2016 11:17:48 -0800
Subject: Rollback linkstatic removal, unforeseen interaction on some archs.
 Change: 126219121

---
 WORKSPACE                                     | 2 +-
 tensorflow/core/BUILD                         | 4 ++++
 tensorflow/core/distributed_runtime/rpc/BUILD | 2 ++
 tensorflow/core/platform/cloud/BUILD          | 1 +
 tensorflow/tensorflow.bzl                     | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WORKSPACE b/WORKSPACE
index f0faabb77e..36d382095b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,7 +20,7 @@ tf_workspace()
 
 # Specify the minimum required bazel version.
 load("//tensorflow:tensorflow.bzl", "check_version")
-check_version("0.3.0")
+check_version("0.2.0")
 
 # TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT
 
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index c37825decd..b684522eb6 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -334,6 +334,7 @@ cc_library(
 cc_library(
     name = "array_grad",
     srcs = ["ops/array_grad.cc"],
+    linkstatic = 1,  # Needed since alwayslink is broken in bazel b/27630669
     visibility = ["//visibility:public"],
     deps = [
         ":array_ops_op_lib",
@@ -346,6 +347,7 @@ cc_library(
 cc_library(
     name = "functional_grad",
     srcs = ["ops/functional_grad.cc"],
+    linkstatic = 1,  # Needed since alwayslink is broken in bazel b/27630669
     visibility = ["//visibility:public"],
     deps = [
         ":framework",
@@ -361,6 +363,7 @@ cc_library(
         "ops/math_grad.cc",
         "ops/random_grad.cc",
     ],
+    linkstatic = 1,  # Needed since alwayslink is broken in bazel b/27630669
     visibility = ["//visibility:public"],
     deps = [
         ":framework",
@@ -373,6 +376,7 @@ cc_library(
 cc_library(
     name = "nn_grad",
     srcs = ["ops/nn_grad.cc"],
+    linkstatic = 1,  # Needed since alwayslink is broken in bazel b/27630669
     visibility = ["//visibility:public"],
     deps = [
         ":framework",
diff --git a/tensorflow/core/distributed_runtime/rpc/BUILD b/tensorflow/core/distributed_runtime/rpc/BUILD
index d95e1a7df0..030cfaf0c3 100644
--- a/tensorflow/core/distributed_runtime/rpc/BUILD
+++ b/tensorflow/core/distributed_runtime/rpc/BUILD
@@ -235,6 +235,7 @@ cc_library(
     name = "grpc_server_lib",
     srcs = ["grpc_server_lib.cc"],
     hdrs = ["grpc_server_lib.h"],
+    linkstatic = 1,  # Seems to be needed since alwayslink is broken in bazel
     deps = [
         ":async_service_interface",
         ":grpc_channel",
@@ -278,6 +279,7 @@ tf_cuda_library(
     name = "grpc_testlib_ops",
     testonly = 1,
     srcs = ["grpc_testlib_ops.cc"],
+    linkstatic = 1,  # Seems to be needed since alwayslink is broken in bazel
     deps = [
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
diff --git a/tensorflow/core/platform/cloud/BUILD b/tensorflow/core/platform/cloud/BUILD
index a1130307fe..639baa2bb5 100644
--- a/tensorflow/core/platform/cloud/BUILD
+++ b/tensorflow/core/platform/cloud/BUILD
@@ -32,6 +32,7 @@ cc_library(
     hdrs = [
         "gcs_file_system.h",
     ],
+    linkstatic = 1,  # Needed since alwayslink is broken in bazel b/27630669
     visibility = ["//visibility:public"],
     deps = [
         ":google_auth_provider",
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 05306db575..874751c536 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -425,6 +425,7 @@ def tf_kernel_library(name, prefix=None, srcs=None, gpu_srcs=None, hdrs=None,
       hdrs = hdrs,
       copts = tf_copts(),
       cuda_deps = cuda_deps,
+      linkstatic = 1,   # Needed since alwayslink is broken in bazel b/27630669
       alwayslink = alwayslink,
       deps = deps,
       **kwargs)
-- 
cgit v1.2.3