From 3ccdb2b695586201cde65e079806c5941ae542b6 Mon Sep 17 00:00:00 2001 From: "David Z. Chen" <davidzchen@users.noreply.github.com> Date: Mon, 31 Oct 2016 09:15:24 -0700 Subject: [PATCH] Use canonical cuda include directory path in CROSSTOOL. (#4096) Fixes #3985 --- third_party/gpus/cuda_configure.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl index 90729463bd3..2c032c9ea48 100644 --- a/third_party/gpus/cuda_configure.bzl +++ b/third_party/gpus/cuda_configure.bzl @@ -141,11 +141,11 @@ def _cuda_toolkit_path(repository_ctx, cuda_version): # <basedir>/cuda-<version> and the provided path is <basedir>/cuda. version_suffixed = "%s-%s" % (cuda_toolkit_path, cuda_version) if repository_ctx.path(version_suffixed).exists: - return version_suffixed + cuda_toolkit_path = version_suffixed # Returns the non-versioned path if cuda version is not provided or if the # installation does not use a cuda- directory, such as on ArchLinux where # CUDA installs directly to /opt/cuda. - return cuda_toolkit_path + return str(repository_ctx.path(cuda_toolkit_path).realpath) def _cudnn_install_basedir(repository_ctx):