diff options
| -rw-r--r-- | tensorflow/workspace.bzl | 6 | ||||
| -rw-r--r-- | third_party/jemalloc.BUILD | 2 | ||||
| -rw-r--r-- | third_party/llvm/llvm.BUILD | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 21557822f4..c5e27ab114 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -315,7 +315,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): # TODO(phawkins): currently, this rule uses an unofficial LLVM mirror. # Switch to an official source of snapshots if/when possible. - native.new_http_archive( + temp_workaround_http_archive( name = "llvm", urls = [ "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/4e9e4f277ad254e02a0cff33c61cd827e600da62.tar.gz", @@ -324,6 +324,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): sha256 = "ec67c57dfd85c2bb857fd13011c5c2aa3f1dc9f40c0a5bac13e78e76d6b61aa6", strip_prefix = "llvm-4e9e4f277ad254e02a0cff33c61cd827e600da62", build_file = str(Label("//third_party/llvm:llvm.BUILD")), + repository = tf_repo_name, ) native.new_http_archive( @@ -396,7 +397,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): actual = "@junit_jar//jar", ) - native.new_http_archive( + temp_workaround_http_archive( name = "jemalloc", urls = [ "http://bazel-mirror.storage.googleapis.com/github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz", @@ -405,4 +406,5 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): sha256 = "3c8f25c02e806c3ce0ab5fb7da1817f89fc9732709024e2a81b6b82f7cc792a8", strip_prefix = "jemalloc-4.4.0", build_file = str(Label("//third_party:jemalloc.BUILD")), + repository = tf_repo_name, ) diff --git a/third_party/jemalloc.BUILD b/third_party/jemalloc.BUILD index 2496d12627..aabff39d7b 100644 --- a/third_party/jemalloc.BUILD +++ b/third_party/jemalloc.BUILD @@ -5,7 +5,7 @@ licenses(["notice"]) # BSD exports_files(["COPYING"]) -load("@//third_party:common.bzl", "template_rule") +load("@%ws%//third_party:common.bzl", "template_rule") cc_library( name = "jemalloc", diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD index 0f7ef74545..330d8b79ce 100644 --- a/third_party/llvm/llvm.BUILD +++ b/third_party/llvm/llvm.BUILD @@ -7,18 +7,18 @@ licenses(["notice"]) exports_files(["LICENSE.TXT"]) load( - "@//third_party/llvm:llvm.bzl", + "@%ws%//third_party/llvm:llvm.bzl", "gentbl", "expand_cmake_vars", "llvm_target_cmake_vars", "cmake_var_string", ) load( - "@//third_party:common.bzl", + "@%ws%//third_party:common.bzl", "template_rule", ) -package(default_visibility = ["@//tensorflow/compiler/xla:internal"]) +package(default_visibility = ["@%ws%//tensorflow/compiler/xla:internal"]) llvm_host_triple = "x86_64-unknown-linux_gnu" @@ -147,7 +147,7 @@ darwin_cmake_vars = { # TODO(phawkins): use a better method to select the right host triple, rather # than hardcoding x86_64. all_cmake_vars = select({ - "@//tensorflow:darwin": cmake_var_string( + "@%ws%//tensorflow:darwin": cmake_var_string( cmake_vars + llvm_target_cmake_vars("X86", "x86_64-apple-darwin") + darwin_cmake_vars, ), |