aboutsummaryrefslogtreecommitdiffhomepage
path: root/configure
diff options
context:
space:
mode:
authorGravatar David Z. Chen <davidzchen@users.noreply.github.com>2016-05-26 15:20:44 -0700
committerGravatar Vijay Vasudevan <vrv@google.com>2016-05-26 15:20:44 -0700
commit14ac2235699509f512b44b71160239c153ab413d (patch)
tree6c25a3b1993c4b35b39bd523ec0937403f34f9bf /configure
parent15e51e6113310e2ff9648812b66ad18af79219fe (diff)
Use external repository for protobuf dependency. (#1289)
Currently, TensorFlow uses a Git submodule for its dependency on protobuf. This was due to the hack used in protobuf for building Python support with Bazel, which was required since Bazel's Python rules did not support adding directories to `PYTHONPATH`. Now that the new `imports` attribute has been added to the Python rules in Bazel 0.2 and the hack for Python support in protobuf has been removed, this change removes the `google/protobuf` Git submodule and adds an external repository for including protobuf. This patch also adds gmock.BUILD to the tensorflow repo. Fixes #1069 Fixes #2021
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 0 insertions, 11 deletions
diff --git a/configure b/configure
index 5d6397da57..98048ba91d 100755
--- a/configure
+++ b/configure
@@ -2,17 +2,6 @@
DO_NOT_SUBMIT_WARNING="Unofficial setting. DO NOT SUBMIT!!!"
-## Verify that the submodule google/protobuf is available
-# TODO(cais): Remove this check once protobuf is no longer depended upon
-if [[ ! -f "google/protobuf/protobuf.bzl" ]]; then
- echo "ERROR: It appears that the required submodule google/protobuf is not "\
-"available in this TensorFlow git clone."
- echo "Please be sure to use the --recurse-submodules flag when performing "\
-"git clone of TensorFlow."
-
- exit 1
-fi
-
## Set up python-related environment settings
while true; do
fromuser=""