diff options
| author |  Jason Zaman <jason@perfinion.com> | 2018-08-04 14:13:00 +0800 |
|---|---|---|
| committer | Jason Zaman <jason@perfinion.com> | 2018-09-28 23:40:29 +0800 |
| commit | a74a3217f7ff2dbee2fb618aa658cf666861545c (patch) | |
| tree | b9d78daf2423b510306bdad610e2dd29953c3c79 | |
| parent | 32627bfba19606d3c3a34f5d02ae9428675bbc42 (diff) | |
Move bazel.rc to workspace root to support bazel-0.18.0
Bazel 0.18.0 will contain a change for which rc files it accepts.
https://github.com/bazelbuild/bazel/commit/ec83598cb6ee4136166bb562a24dc5dfa58921db
https://github.com/bazelbuild/bazel/issues/4502
Old bazel used to read %workspace%/tools/bazel.rc. New bazel will not
read that and instead will only read %workspace%/.bazelrc.
Signed-off-by: Jason Zaman <jason@perfinion.com>
| -rw-r--r-- | .bazelrc (renamed from tools/bazel.rc) | 4 | ||||
| -rw-r--r-- | .gitignore | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/bazel.rc b/.bazelrc index 3734fab715..9f09fdff97 100644 --- a/tools/bazel.rc +++ b/.bazelrc @@ -29,7 +29,7 @@ build:mkl -c opt # This config option is used to enable MKL-DNN open source library only, # without depending on MKL binary version. -build:mkl_open_source_only --define=build_with_mkl_dnn_only=true +build:mkl_open_source_only --define=build_with_mkl_dnn_only=true build:mkl_open_source_only --define=build_with_mkl=true --define=enable_mkl=true build:download_clang --crosstool_top=@local_config_download_clang//:toolchain @@ -84,3 +84,5 @@ 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 diff --git a/.gitignore b/.gitignore index 1ef4c297ee..cb65f447d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .DS_Store .ipynb_checkpoints node_modules -/.bazelrc /.tf_configure.bazelrc /bazel-* /bazel_pip |