Merge commit for internal changes

2 files changed, 17 insertions, 14 deletions

diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD
index 7dd348975d..ddaf29a086 100644
--- a/third_party/mkl/BUILD
+++ b/third_party/mkl/BUILD
@@ -10,7 +10,10 @@ config_setting(
 
 cc_library(
     name = "intel_binary_blob",
+    srcs = [
+        "libiomp5.so",
+        "libmklml_intel.so",
+    ],
     includes = ["."],
-    srcs = ["libmklml_intel.so", "libiomp5.so"],
     visibility = ["//visibility:public"],
 )
diff --git a/third_party/mkl/build_defs.bzl b/third_party/mkl/build_defs.bzl
index da89330c5a..9a28b312c2 100644
--- a/third_party/mkl/build_defs.bzl
+++ b/third_party/mkl/build_defs.bzl
@@ -1,13 +1,13 @@
-# Macros for building MKL code.

-

-def if_mkl(if_true, if_false = []):

-    """Shorthand for select()'ing on whether we're building with MKL.

-

-    Returns a select statement which evaluates to if_true if we're building

-    with MKL enabled.  Otherwise, the select statement evaluates to if_false.

-

-    """

-    return select({

-        "//third_party/mkl:using_mkl": if_true,

-        "//conditions:default": if_false

-    })

+# Macros for building MKL code.
+
+def if_mkl(if_true, if_false = []):
+    """Shorthand for select()'ing on whether we're building with MKL.
+
+    Returns a select statement which evaluates to if_true if we're building
+    with MKL enabled.  Otherwise, the select statement evaluates to if_false.
+
+    """
+    return select({
+        "//third_party/mkl:using_mkl": if_true,
+        "//conditions:default": if_false
+    })