From 51dbc464832599c4d450d078d00e56a011233277 Mon Sep 17 00:00:00 2001
From: Andrew Harp <andrewharp@google.com>
Date: Fri, 27 Jan 2017 14:42:30 -0800
Subject: Delete downloaded BUILD files for makefile dependencies immediately
 after extracting and also at the beginning of ./configure. This will prevent
 bazel from erroneously parsing contrib/makefile/downloads during
 configuration if a makefile build has previously been performed. Change:
 145838744

---
 configure | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index a8e7bb7738..6cd5c2f3db 100755
--- a/configure
+++ b/configure
@@ -44,6 +44,13 @@ function bazel_clean_and_fetch() {
   bazel fetch "//tensorflow/... -//tensorflow/examples/android/..."
 }
 
+# Delete any leftover BUILD files from the Makefile build, which would interfere
+# with Bazel parsing.
+MAKEFILE_DOWNLOAD_DIR=tensorflow/contrib/makefile/downloads
+if [ -d "${MAKEFILE_DOWNLOAD_DIR}" ]; then
+  find ${MAKEFILE_DOWNLOAD_DIR} -type f -name '*BUILD' -delete
+fi
+
 ## Set up python-related environment settings
 while true; do
   fromuser=""
-- 
cgit v1.2.3