aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
authorGravatar Peter Hawkins <phawkins@google.com>2016-12-09 08:04:40 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-12-09 08:24:21 -0800
commit4fc106f5f89b444f1d99428c82df3406d64d059c (patch)
treec293aab805f73dd54a39ceec53cb60e2d53b6ef3 /third_party
parent63dc340e23d6aeca83323c3959dea10d20dfd0fc (diff)
Add placeholder plugins list to tensorflow/python:pywrap_tensorflow build target.
Add missing zlib dependency to LLVM build file. Various other small cleanups. Change: 141557751
Diffstat (limited to 'third_party')
-rw-r--r--third_party/llvm/BUILD1
-rw-r--r--third_party/llvm/expand_cmake_vars.py2
-rw-r--r--third_party/llvm/llvm.BUILD3
3 files changed, 5 insertions, 1 deletions
diff --git a/third_party/llvm/BUILD b/third_party/llvm/BUILD
index 5b9ec0f8fd..0a9fd6b581 100644
--- a/third_party/llvm/BUILD
+++ b/third_party/llvm/BUILD
@@ -3,5 +3,6 @@ licenses(["notice"])
py_binary(
name = "expand_cmake_vars",
srcs = ["expand_cmake_vars.py"],
+ srcs_version = "PY2AND3",
visibility = ["@llvm//:__subpackages__"],
)
diff --git a/third_party/llvm/expand_cmake_vars.py b/third_party/llvm/expand_cmake_vars.py
index 51e668428f..ffc6a255fd 100644
--- a/third_party/llvm/expand_cmake_vars.py
+++ b/third_party/llvm/expand_cmake_vars.py
@@ -47,7 +47,7 @@ def _expand_variables(input_str, cmake_vars):
The expanded string.
"""
def replace(match):
- if cmake_vars.has_key(match.group(1)):
+ if match.group(1) in cmake_vars:
return cmake_vars[match.group(1)]
return ""
return _CMAKE_VAR_REGEX.sub(replace, input_str)
diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index 87ee101ca4..46448e06ec 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -4,6 +4,8 @@
licenses(["notice"])
+exports_files(["LICENSE.TXT"])
+
load(
"@//third_party/llvm:llvm.bzl",
"gentbl",
@@ -1664,6 +1666,7 @@ cc_library(
deps = [
":config",
":demangle",
+ "@zlib_archive//:zlib",
],
)