diff options
| author |  Gunhan Gulsoy <gunan@google.com> | 2018-06-18 22:50:57 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-06-18 22:53:41 -0700 |
| commit | c9b142cec6e5340709279f8f373fcc139509168b (patch) | |
| tree | 94d12f7b94eeb5c14ff5c61c4e1d2c53025efeee | |
| parent | a79d083197fdcc887c2f39d4942e1f0c848234f2 (diff) | |
Automated g4 rollback of changelist 200988382
PiperOrigin-RevId: 201119398
| -rw-r--r-- | tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh | 7 | ||||
| -rwxr-xr-x | tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh b/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh index 4aa270ea86..0b13b97209 100644 --- a/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh +++ b/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh @@ -77,12 +77,7 @@ fi # to distinct them. This helps avoid building the same targets twice. echo "build --distinct_host_configuration=false" >> "${TMP_BAZELRC}" -# Enable short object file path to avoid long path issue on Windows. -echo "build --output_user_root=${TMPDIR}" >> "${TMP_BAZELRC}" - -if ! grep -q "import %workspace%/${TMP_BAZELRC}" .bazelrc; then - echo "import %workspace%/${TMP_BAZELRC}" >> .bazelrc -fi +echo "import %workspace%/${TMP_BAZELRC}" >> .bazelrc run_configure_for_cpu_build diff --git a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh index 022f120dbd..583d1d5f09 100755 --- a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh +++ b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh @@ -41,7 +41,7 @@ run_configure_for_cpu_build # build_libtensorflow_tarball in ../builds/libtensorflow.sh # cannot be used on Windows since it relies on pkg_tar rules. # So we do something special here -bazel build -c opt --copt=/arch:AVX --output_user_root=${TMPDIR} \ +bazel build -c opt --copt=/arch:AVX \ tensorflow:libtensorflow.so \ tensorflow/tools/lib_package:clicenses_generate \ tensorflow/java:libtensorflow_jni.so \ |