Revert "Move bazel.rc to workspace root to support bazel-0.18.0"

This reverts commit a74a321. Bazel-0.18.0 is changing where it searches for .bazelrc files. Originally it was removing /tools/bazel.rc and only using /.bazelrc. This causes issues for gitignoring /.bazelrc and 0.18.0 has temporarily added tools/bazel.rc back to the list until 0.19. The long term solution is to use try-import but that statement is new in 0.18 and we are not going to bump TF's minimum right away. When 0.19 is out things will need to be changed back and the minimum bumped to 0.18. Fixes: tensorflow#22762 Fixes: tensorflow#22906 Signed-off-by: Jason Zaman <[email protected]>
adology · Oct 14, 2018 · c11b545 · c11b545
1 parent e4b1832
commit c11b545
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 .ipynb_checkpoints
 node_modules
+/.bazelrc
 /.tf_configure.bazelrc
 /bazel-*
 /bazel_pip

diff --git a/.bazelrc → tools/bazel.rc b/.bazelrc → tools/bazel.rc
@@ -91,5 +91,3 @@ build:dynamic_kernels --define=dynamic_loaded_kernels=true
 build --define=PREFIX=/usr
 build --define=LIBDIR=$(PREFIX)/lib
 build --define=INCLUDEDIR=$(PREFIX)/include
-
-# Do not commit the tf_configure.bazelrc line