From 13024c58fa87a87db23f6869a0c33598bb5c027d Mon Sep 17 00:00:00 2001
From: Manjunath Kudlur <keveman@gmail.com>
Date: Mon, 7 Mar 2016 15:09:08 -0800
Subject: Changed the cuda_crosstool_condition to check for a define of
 using_cuda. Checking for a specific crosstool_top directory doesn't work when
 TensorFlow is a sub-module for a different project. Change: 116592676

---
 third_party/gpus/cuda/BUILD | 6 +++---
 tools/bazel.rc.template     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/third_party/gpus/cuda/BUILD b/third_party/gpus/cuda/BUILD
index fa29fde449..bf7ad7662a 100644
--- a/third_party/gpus/cuda/BUILD
+++ b/third_party/gpus/cuda/BUILD
@@ -10,14 +10,14 @@ package(default_visibility = ["//visibility:public"])
 
 config_setting(
     name = "cuda_crosstool_condition",
-    values = {"crosstool_top": "//third_party/gpus/crosstool"},
+    values = {"define": "using_cuda=true"},
     visibility = ["//visibility:public"],
 )
 
 config_setting(
     name = "using_gcudacc",
     values = {
-        "crosstool_top": "//third_party/gpus/crosstool",
+        "define": "using_cuda=true",
         "copt": "--use_gcudacc",
     },
     visibility = ["//visibility:public"],
@@ -26,7 +26,7 @@ config_setting(
 config_setting(
     name = "using_nvcc",
     values = {
-        "crosstool_top": "//third_party/gpus/crosstool",
+        "define": "using_cuda=true",
         "copt": "--use_nvcc",
     },
 )
diff --git a/tools/bazel.rc.template b/tools/bazel.rc.template
index 5bdc9884e8..e90ec790fd 100644
--- a/tools/bazel.rc.template
+++ b/tools/bazel.rc.template
@@ -1,4 +1,5 @@
 build:cuda --crosstool_top=//third_party/gpus/crosstool
+build:cuda --define=using_cuda=true
 
 build --force_python=py$PYTHON_MAJOR_VERSION
 build --python$PYTHON_MAJOR_VERSION_path=$PYTHON_BINARY
-- 
cgit v1.2.3