From bed8383c27a0a7225e6fc7ff59a2cd6388fb4d09 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Thu, 22 Dec 2016 15:38:30 -0800
Subject: Merge changes from github. Change: 142805270

---
 configure | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index d6d3e19afa..c2401252dd 100755
--- a/configure
+++ b/configure
@@ -23,9 +23,13 @@ function bazel_clean_and_fetch() {
   # TODO(pcloudy): Re-enable it after bazel clean --expunge is fixed.
   if ! is_windows; then
     bazel clean --expunge
+    # TODO(https://github.com/bazelbuild/bazel/issues/2220) Remove the nested `bazel query`.
+    bazel fetch $(bazel query "//tensorflow/... -//tensorflow/examples/android/...")
+  else
+    # TODO(pcloudy): Also filter out //tensorflow/examples/android/... on Windows after
+    # https://github.com/bazelbuild/bazel/issues/2248 is fixed.
+    bazel fetch //tensorflow/...
   fi
-  # TODO(https://github.com/bazelbuild/bazel/issues/2220) Remove the nested `bazel query`.
-  bazel fetch $(bazel query "//tensorflow/... -//tensorflow/examples/android/...")
 }
 
 ## Set up python-related environment settings
@@ -280,7 +284,7 @@ while true; do
       TF_CUDNN_VERSION=${BASH_REMATCH[1]}
       echo "libcudnn.so resolves to libcudnn${TF_CUDNN_EXT}"
     elif [[ "$REALVAL" =~ ([0-9]*).dylib ]]; then
-      TF_CUDNN_EXT="."${BASH_REMATCH[1]}".dylib"
+      TF_CUDNN_EXT=${BASH_REMATCH[1]}".dylib"
       TF_CUDNN_VERSION=${BASH_REMATCH[1]}
       echo "libcudnn.dylib resolves to libcudnn${TF_CUDNN_EXT}"
     fi
@@ -387,7 +391,7 @@ if [ "$TF_NEED_OPENCL" == "1" ]; then
 while true; do
   fromuser=""
   if [ -z "$HOST_CXX_COMPILER" ]; then
-    default_cxx_host_compiler=$(which g++|| true)
+    default_cxx_host_compiler=$(which clang++-3.6 || true)
     read -p "Please specify which C++ compiler should be used as the host C++ compiler. [Default is $default_cxx_host_compiler]: " HOST_CXX_COMPILER
     fromuser="1"
     if [ -z "$HOST_CXX_COMPILER" ]; then
@@ -410,7 +414,7 @@ done
 while true; do
   fromuser=""
   if [ -z "$HOST_C_COMPILER" ]; then
-    default_c_host_compiler=$(which gcc|| true)
+    default_c_host_compiler=$(which clang-3.6 || true)
     read -p "Please specify which C compiler should be used as the host C compiler. [Default is $default_c_host_compiler]: " HOST_C_COMPILER
     fromuser="1"
     if [ -z "$HOST_C_COMPILER" ]; then
-- 
cgit v1.2.3