diff --git a/.bazelrc b/.bazelrc
index 17410912425..d4d7ad61867 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -10,6 +10,9 @@ build:android_arm64 --config=android
build:android_arm64 --cpu=arm64-v8a
build:android_arm64 --fat_apk_cpu=arm64-v8a
+# Sets the default Apple platform to macOS.
+build --apple_platform_type=macos
+
# Config to use a mostly-static build and disable modular op registration
# support (this will revert to loading TensorFlow with RTLD_GLOBAL in Python).
# By default, TensorFlow will build with a dependence on
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index af31ecc23c7..24d34cf9c15 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -147,12 +147,6 @@ config_setting(
visibility = ["//visibility:public"],
)
-config_setting(
- name = "darwin",
- values = {"cpu": "darwin"},
- visibility = ["//visibility:public"],
-)
-
config_setting(
name = "windows",
values = {"cpu": "x64_windows"},
@@ -165,9 +159,18 @@ config_setting(
visibility = ["//visibility:public"],
)
+config_setting(
+ name = "macos",
+ values = {
+ "apple_platform_type": "macos",
+ "cpu": "darwin",
+ },
+ visibility = ["//visibility:public"],
+)
+
config_setting(
name = "ios",
- values = {"crosstool_top": "//tools/osx/crosstool:crosstool"},
+ values = {"apple_platform_type": "ios"},
visibility = ["//visibility:public"],
)
@@ -467,7 +470,7 @@ tf_cc_shared_object(
name = "libtensorflow_framework.so",
framework_so = [],
linkopts = select({
- "//tensorflow:darwin": [],
+ "//tensorflow:macos": [],
"//tensorflow:windows": [],
"//conditions:default": [
"-Wl,--version-script,$(location //tensorflow:tf_framework_version_script.lds)",
@@ -503,7 +506,7 @@ tf_cc_shared_object(
tf_cc_shared_object(
name = "tensorflow",
linkopts = select({
- "//tensorflow:darwin": [
+ "//tensorflow:macos": [
"-Wl,-exported_symbols_list,$(location //tensorflow/c:exported_symbols.lds)",
"-Wl,-install_name,@rpath/libtensorflow.so",
],
@@ -535,7 +538,7 @@ tf_cc_shared_object(
tf_cc_shared_object(
name = "tensorflow_cc",
linkopts = select({
- "//tensorflow:darwin": [
+ "//tensorflow:macos": [
"-Wl,-exported_symbols_list,$(location //tensorflow:tf_exported_symbols.lds)",
],
"//tensorflow:windows": [],
diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
index 22e283ee32f..3c43467b510 100644
--- a/tensorflow/c/BUILD
+++ b/tensorflow/c/BUILD
@@ -282,7 +282,7 @@ tf_cuda_cc_test(
],
kernels = [":test_op_kernel"],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
tags = [
@@ -331,7 +331,7 @@ tf_cc_test(
srcs = ["c_api_experimental_test.cc"],
data = ["testdata/tf_record"],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
# We must ensure that the dependencies can be dynamically linked since
@@ -400,7 +400,7 @@ tf_cuda_cc_test(
size = "small",
srcs = ["env_test.cc"],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
tags = ["noasan"],
@@ -421,7 +421,7 @@ tf_cuda_cc_test(
size = "small",
srcs = ["kernels_test.cc"],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
tags = ["noasan"],
diff --git a/tensorflow/cc/BUILD b/tensorflow/cc/BUILD
index 4c4d587fce0..fca9416fdca 100644
--- a/tensorflow/cc/BUILD
+++ b/tensorflow/cc/BUILD
@@ -686,7 +686,7 @@ tf_cc_binary(
copts = tf_copts(),
linkopts = select({
"//tensorflow:windows": [],
- "//tensorflow:darwin": [
+ "//tensorflow:macos": [
"-lm",
"-lpthread",
],
diff --git a/tensorflow/compiler/aot/tfcompile.bzl b/tensorflow/compiler/aot/tfcompile.bzl
index 2abe3e29b78..fd701ab7166 100644
--- a/tensorflow/compiler/aot/tfcompile.bzl
+++ b/tensorflow/compiler/aot/tfcompile.bzl
@@ -392,6 +392,6 @@ def target_llvm_triple():
"//tensorflow:android_x86": "i686-none-android",
"//tensorflow:ios": "arm64-none-ios",
"//tensorflow:linux_ppc64le": "ppc64le-ibm-linux-gnu",
- "//tensorflow:darwin": "x86_64-none-darwin",
+ "//tensorflow:macos": "x86_64-none-darwin",
"//conditions:default": "x86_64-pc-linux",
})
diff --git a/tensorflow/compiler/xla/python/BUILD b/tensorflow/compiler/xla/python/BUILD
index 68128a3097f..0aed81f1024 100644
--- a/tensorflow/compiler/xla/python/BUILD
+++ b/tensorflow/compiler/xla/python/BUILD
@@ -119,7 +119,7 @@ tf_py_wrap_cc(
"//tensorflow/python:platform/base.i",
],
version_script = select({
- "//tensorflow:darwin": "pywrap_xla_exported_symbols.lds",
+ "//tensorflow:macos": "pywrap_xla_exported_symbols.lds",
"//tensorflow:windows": None,
"//conditions:default": "pywrap_xla_version_script.lds",
}),
@@ -143,7 +143,7 @@ tf_py_wrap_cc(
"//tensorflow/python:platform/base.i",
],
version_script = select({
- "//tensorflow:darwin": "pywrap_xla_exported_symbols.lds",
+ "//tensorflow:macos": "pywrap_xla_exported_symbols.lds",
"//tensorflow:windows": None,
"//conditions:default": "pywrap_xla_version_script.lds",
}),
diff --git a/tensorflow/contrib/util/BUILD b/tensorflow/contrib/util/BUILD
index ada08f95ae4..7b2bc30e3a8 100644
--- a/tensorflow/contrib/util/BUILD
+++ b/tensorflow/contrib/util/BUILD
@@ -44,7 +44,7 @@ tf_cc_test(
name = "convert_graphdef_memmapped_format_test",
srcs = ["convert_graphdef_memmapped_format_test.cc"],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
deps = [
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 9114013251a..777cc3d8185 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -3918,7 +3918,7 @@ tf_cc_tests(
"util/work_sharder_test.cc",
],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
linkstatic = tf_kernel_tests_linkstatic(),
@@ -3958,7 +3958,7 @@ tf_cc_tests(
"graph/graph_constructor_test.cc",
],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
linkstatic = tf_kernel_tests_linkstatic(),
diff --git a/tensorflow/core/distributed_runtime/rpc/BUILD b/tensorflow/core/distributed_runtime/rpc/BUILD
index dd22e74ac54..57fb5e15090 100644
--- a/tensorflow/core/distributed_runtime/rpc/BUILD
+++ b/tensorflow/core/distributed_runtime/rpc/BUILD
@@ -420,7 +420,7 @@ tf_cuda_cc_tests(
"rpc_rendezvous_mgr_test.cc",
],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
linkstatic = tf_kernel_tests_linkstatic(),
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 59bec44401d..a6195945054 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -1761,7 +1761,7 @@ tf_cc_test(
size = "small",
srcs = ["slice_op_test.cc"],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
deps = [
@@ -2688,7 +2688,7 @@ tf_cc_tests(
"scale_and_translate_op_test.cc",
],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
deps = [
@@ -2918,7 +2918,7 @@ tf_kernel_library(
# and f2c helper functions in global namespace. Tell the compiler to
# allow multiple definitions when linking this.
linkopts = select({
- "//tensorflow:darwin": [],
+ "//tensorflow:macos": [],
"//tensorflow:windows": [],
"//conditions:default": ["-Wl,-z,muldefs"],
}),
@@ -3554,7 +3554,7 @@ tf_cuda_cc_test(
size = "small",
srcs = ["scan_ops_test.cc"],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
deps = [
@@ -3577,7 +3577,7 @@ tf_cuda_cc_test(
size = "small",
srcs = ["reduction_ops_test.cc"],
linkopts = select({
- "//tensorflow:darwin": ["-headerpad_max_install_names"],
+ "//tensorflow:macos": ["-headerpad_max_install_names"],
"//conditions:default": [],
}),
deps = [
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index f6f449a95d2..40eb0f63d72 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -769,7 +769,7 @@ def tf_additional_numa_deps():
"//tensorflow:android": [],
"//tensorflow:ios": [],
"//tensorflow:windows": [],
- "//tensorflow:darwin": [],
+ "//tensorflow:macos": [],
"//conditions:default": [
"@hwloc",
],
@@ -780,7 +780,7 @@ def tf_additional_numa_copts():
"//tensorflow:android": [],
"//tensorflow:ios": [],
"//tensorflow:windows": [],
- "//tensorflow:darwin": [],
+ "//tensorflow:macos": [],
"//conditions:default": [
"-Ithird_party/hwloc/hwloc-master/include",
"-DTENSORFLOW_USE_NUMA",
diff --git a/tensorflow/java/BUILD b/tensorflow/java/BUILD
index 4708c7524cc..d70e0d6c0ab 100644
--- a/tensorflow/java/BUILD
+++ b/tensorflow/java/BUILD
@@ -363,7 +363,7 @@ filegroup(
name = "libtensorflow_jni",
srcs = select({
"//tensorflow:windows": [":tensorflow_jni.dll"],
- "//tensorflow:darwin": [":libtensorflow_jni.dylib"],
+ "//tensorflow:macos": [":libtensorflow_jni.dylib"],
"//conditions:default": [":libtensorflow_jni.so"],
}),
visibility = ["//visibility:public"],
@@ -380,7 +380,7 @@ tf_cc_binary(
# considerably (~50% as of January 2017).
linkopts = select({
"//tensorflow:debug": [], # Disable all custom linker options in debug mode
- "//tensorflow:darwin": [
+ "//tensorflow:macos": [
"-Wl,-exported_symbols_list,$(location {})".format(LINKER_EXPORTED_SYMBOLS),
],
"//tensorflow:windows": [],
diff --git a/tensorflow/java/src/main/native/BUILD b/tensorflow/java/src/main/native/BUILD
index 49348daa94e..4eb62b14bc7 100644
--- a/tensorflow/java/src/main/native/BUILD
+++ b/tensorflow/java/src/main/native/BUILD
@@ -68,7 +68,7 @@ genrule(
name = "copy_jni_md_h",
srcs = select({
"//tensorflow:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"],
- "//tensorflow:darwin": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
+ "//tensorflow:macos": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
"//conditions:default": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
}),
outs = ["jni_md.h"],
diff --git a/tensorflow/lite/BUILD b/tensorflow/lite/BUILD
index 46800a89bb7..e3493082ee7 100644
--- a/tensorflow/lite/BUILD
+++ b/tensorflow/lite/BUILD
@@ -406,7 +406,7 @@ cc_test(
tflite_cc_shared_object(
name = "libtensorflowlite.so",
linkopts = select({
- "//tensorflow:darwin": [
+ "//tensorflow:macos": [
"-Wl,-exported_symbols_list,$(location //tensorflow/lite:tflite_exported_symbols.lds)",
"-Wl,-install_name,@rpath/libtensorflowlite.so",
],
diff --git a/tensorflow/lite/experimental/c/BUILD b/tensorflow/lite/experimental/c/BUILD
index ac71c9bd34e..aef39db0214 100644
--- a/tensorflow/lite/experimental/c/BUILD
+++ b/tensorflow/lite/experimental/c/BUILD
@@ -19,7 +19,7 @@ load(
tflite_cc_shared_object(
name = "libtensorflowlite_c.so",
linkopts = select({
- "//tensorflow:darwin": [
+ "//tensorflow:macos": [
"-Wl,-exported_symbols_list,$(location //tensorflow/lite/experimental/c:exported_symbols.lds)",
"-Wl,-install_name,@rpath/libtensorflowlite_c.so",
],
diff --git a/tensorflow/lite/java/jni/BUILD b/tensorflow/lite/java/jni/BUILD
index ce17ac4fa0d..3121cda7fe6 100644
--- a/tensorflow/lite/java/jni/BUILD
+++ b/tensorflow/lite/java/jni/BUILD
@@ -39,7 +39,7 @@ genrule(
genrule(
name = "copy_jni_md_h",
srcs = select({
- "//tensorflow:darwin": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
+ "//tensorflow:macos": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
"//conditions:default": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
}),
outs = ["jni_md.h"],
diff --git a/tensorflow/lite/nnapi/BUILD b/tensorflow/lite/nnapi/BUILD
index 8ee9f3c221a..662754d59bf 100644
--- a/tensorflow/lite/nnapi/BUILD
+++ b/tensorflow/lite/nnapi/BUILD
@@ -31,7 +31,7 @@ cc_library(
],
linkopts = ["-ldl"] + select({
"//tensorflow:android": [],
- "//tensorflow:darwin": [],
+ "//tensorflow:macos": [],
"//tensorflow:ios": [],
"//tensorflow:windows": [],
"//conditions:default": ["-lrt"],
diff --git a/tensorflow/lite/toco/BUILD b/tensorflow/lite/toco/BUILD
index c477e2f4c08..8481b0b754c 100644
--- a/tensorflow/lite/toco/BUILD
+++ b/tensorflow/lite/toco/BUILD
@@ -310,7 +310,7 @@ cc_library(
"toco_tooling.h",
],
copts = tf_copts() + select({
- "//tensorflow:darwin": ["-DTOCO_SUPPORT_PORTABLE_PROTOS=0"],
+ "//tensorflow:macos": ["-DTOCO_SUPPORT_PORTABLE_PROTOS=0"],
"//conditions:default": [],
}),
visibility = ["//visibility:public"],
@@ -335,7 +335,7 @@ cc_library(
"//tensorflow/lite/toco/tflite:export",
"//tensorflow/lite/toco/tflite:import",
] + select({
- # Placeholder for internal darwin rule.
+ # Placeholder for internal macOS rule.
"//conditions:default": [],
}),
)
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 2304eb134bf..1dcb23e9a4b 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -503,7 +503,7 @@ tf_cc_shared_object(
"//conditions:default": [
"-lm",
],
- "//tensorflow:darwin": [],
+ "//tensorflow:macos": [],
"//tensorflow:windows": [],
}),
deps = [
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 3f8ed06b525..a7684a17ae7 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -158,6 +158,12 @@ def if_emscripten(a):
"//conditions:default": [],
})
+def if_macos(a):
+ return select({
+ clean_dep("//tensorflow:macos"): a,
+ "//conditions:default": [],
+ })
+
def if_ios(a):
return select({
clean_dep("//tensorflow:ios"): a,
@@ -216,12 +222,6 @@ def if_linux_x86_64(a):
"//conditions:default": [],
})
-def if_darwin(a):
- return select({
- clean_dep("//tensorflow:darwin"): a,
- "//conditions:default": [],
- })
-
def if_override_eigen_strong_inline(a):
return select({
clean_dep("//tensorflow:override_eigen_strong_inline"): a,
@@ -295,7 +295,7 @@ def tf_copts(android_optimization_level_override = "-O2", is_external = False):
}) +
select({
clean_dep("//tensorflow:android"): android_copts,
- clean_dep("//tensorflow:darwin"): [],
+ clean_dep("//tensorflow:macos"): [],
clean_dep("//tensorflow:windows"): get_win_copts(is_external),
clean_dep("//tensorflow:ios"): ["-std=c++11"],
clean_dep("//tensorflow:no_lgpl_deps"): ["-D__TENSORFLOW_NO_LGPL_DEPS__", "-pthread"],
@@ -367,7 +367,7 @@ def _rpath_linkopts(name):
# directory in the tensorflow/ tree.
levels_to_root = native.package_name().count("/") + name.count("/")
return select({
- clean_dep("//tensorflow:darwin"): [
+ clean_dep("//tensorflow:macos"): [
"-Wl,%s" % (_make_search_paths("@loader_path", levels_to_root),),
],
clean_dep("//tensorflow:windows"): [],
@@ -438,7 +438,7 @@ def tf_cc_shared_object(
linkshared = 1,
data = data,
linkopts = linkopts + _rpath_linkopts(name_os) + select({
- clean_dep("//tensorflow:darwin"): [
+ clean_dep("//tensorflow:macos"): [
"-Wl,-install_name,@rpath/" + name_os.split("/")[-1],
],
clean_dep("//tensorflow:windows"): [],
@@ -454,7 +454,7 @@ def tf_cc_shared_object(
name = name,
srcs = select({
"//tensorflow:windows": [":%s.dll" % name],
- "//tensorflow:darwin": [":lib%s.dylib" % name],
+ "//tensorflow:macos": [":lib%s.dylib" % name],
"//conditions:default": [":lib%s.so" % name],
}),
visibility = visibility,
@@ -509,7 +509,7 @@ def tf_cc_binary(
name = name,
srcs = select({
"//tensorflow:windows": [":%s.dll" % name],
- "//tensorflow:darwin": [":lib%s.dylib" % name],
+ "//tensorflow:macos": [":lib%s.dylib" % name],
"//conditions:default": [":lib%s.so" % name],
}),
visibility = visibility,
@@ -845,7 +845,7 @@ def tf_cc_test(
"-pie",
],
clean_dep("//tensorflow:windows"): [],
- clean_dep("//tensorflow:darwin"): [
+ clean_dep("//tensorflow:macos"): [
"-lm",
],
"//conditions:default": [
@@ -867,7 +867,7 @@ def tf_cc_test(
# cc_tests with ".so"s in srcs incorrectly link on Darwin unless
# linkstatic=1 (https://github.com/bazelbuild/bazel/issues/3450).
# TODO(allenl): Remove Mac static linking when Bazel 0.6 is out.
- clean_dep("//tensorflow:darwin"): 1,
+ clean_dep("//tensorflow:macos"): 1,
"//conditions:default": 0,
}),
nocopts = nocopts,
@@ -944,7 +944,7 @@ def tf_cuda_cc_test(
linkopts = linkopts,
linkstatic = select({
# TODO(allenl): Remove Mac static linking when Bazel 0.6 is out.
- clean_dep("//tensorflow:darwin"): 1,
+ clean_dep("//tensorflow:macos"): 1,
"@local_config_cuda//cuda:using_nvcc": 1,
"@local_config_cuda//cuda:using_clang": 1,
"//conditions:default": 0,
@@ -992,7 +992,7 @@ def tf_cuda_only_cc_test(
# cc_tests with ".so"s in srcs incorrectly link on Darwin
# unless linkstatic=1.
# TODO(allenl): Remove Mac static linking when Bazel 0.6 is out.
- clean_dep("//tensorflow:darwin"): 1,
+ clean_dep("//tensorflow:macos"): 1,
"//conditions:default": 0,
}),
tags = tags,
@@ -1638,7 +1638,7 @@ def tf_custom_op_library(name, srcs = [], gpu_srcs = [], deps = [], linkopts = [
"-lm",
],
clean_dep("//tensorflow:windows"): [],
- clean_dep("//tensorflow:darwin"): [],
+ clean_dep("//tensorflow:macos"): [],
}),
**kwargs
)
diff --git a/tensorflow/tools/proto_text/BUILD b/tensorflow/tools/proto_text/BUILD
index b4b70e0a78e..60c0f423303 100644
--- a/tensorflow/tools/proto_text/BUILD
+++ b/tensorflow/tools/proto_text/BUILD
@@ -50,7 +50,7 @@ cc_library(
copts = if_ios(["-DGOOGLE_LOGGING"]),
linkopts = select({
"//tensorflow:windows": [],
- "//tensorflow:darwin": [
+ "//tensorflow:macos": [
"-lm",
"-lpthread",
],
diff --git a/third_party/aws/BUILD.bazel b/third_party/aws/BUILD.bazel
index fde3072403f..e59e80feaf1 100644
--- a/third_party/aws/BUILD.bazel
+++ b/third_party/aws/BUILD.bazel
@@ -15,7 +15,7 @@ cc_library(
"@org_tensorflow//tensorflow:linux_x86_64": glob([
"aws-cpp-sdk-core/source/platform/linux-shared/*.cpp",
]),
- "@org_tensorflow//tensorflow:darwin": glob([
+ "@org_tensorflow//tensorflow:macos": glob([
"aws-cpp-sdk-core/source/platform/linux-shared/*.cpp",
]),
"@org_tensorflow//tensorflow:linux_ppc64le": glob([
@@ -65,7 +65,7 @@ cc_library(
"ENABLE_CURL_CLIENT",
"ENABLE_NO_ENCRYPTION",
],
- "@org_tensorflow//tensorflow:darwin": [
+ "@org_tensorflow//tensorflow:macos": [
"PLATFORM_APPLE",
"ENABLE_CURL_CLIENT",
"ENABLE_NO_ENCRYPTION",
diff --git a/third_party/curl.BUILD b/third_party/curl.BUILD
index c93fac65492..a3aa3ce4ddb 100644
--- a/third_party/curl.BUILD
+++ b/third_party/curl.BUILD
@@ -236,7 +236,7 @@ cc_library(
"lib/wildcard.h",
"lib/x509asn1.h",
] + select({
- "@org_tensorflow//tensorflow:darwin": [
+ "@org_tensorflow//tensorflow:macos": [
"lib/vtls/darwinssl.c",
],
"@org_tensorflow//tensorflow:ios": [
@@ -271,7 +271,7 @@ cc_library(
"-Wno-string-plus-int",
],
}) + select({
- "@org_tensorflow//tensorflow:darwin": [
+ "@org_tensorflow//tensorflow:macos": [
"-fno-constant-cfstrings",
],
"@org_tensorflow//tensorflow:windows": [
@@ -288,7 +288,7 @@ cc_library(
"@org_tensorflow//tensorflow:android": [
"-pie",
],
- "@org_tensorflow//tensorflow:darwin": [
+ "@org_tensorflow//tensorflow:macos": [
"-Wl,-framework",
"-Wl,CoreFoundation",
"-Wl,-framework",
diff --git a/third_party/llvm/llvm.bzl b/third_party/llvm/llvm.bzl
index 5a977f82c41..ffec30648c6 100644
--- a/third_party/llvm/llvm.bzl
+++ b/third_party/llvm/llvm.bzl
@@ -291,7 +291,7 @@ win32_cmake_vars = {
# TODO(phawkins): use a better method to select the right host triple, rather
# than hardcoding x86_64.
llvm_all_cmake_vars = select({
- "@org_tensorflow//tensorflow:darwin": cmake_var_string(
+ "@org_tensorflow//tensorflow:macos": cmake_var_string(
_dict_add(
cmake_vars,
llvm_target_cmake_vars("X86", "x86_64-apple-darwin"),
diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD
index 15a3e5cfa7e..aaca1e9b6f5 100644
--- a/third_party/mkl/BUILD
+++ b/third_party/mkl/BUILD
@@ -48,7 +48,7 @@ filegroup(
"@org_tensorflow//tensorflow:linux_x86_64": [
"@mkl_linux//:LICENSE",
],
- "@org_tensorflow//tensorflow:darwin": [
+ "@org_tensorflow//tensorflow:macos": [
"@mkl_darwin//:LICENSE",
],
"@org_tensorflow//tensorflow:windows": [
@@ -67,7 +67,7 @@ cc_library(
"@mkl_linux//:mkl_headers",
"@mkl_linux//:mkl_libs_linux",
],
- "@org_tensorflow//tensorflow:darwin": [
+ "@org_tensorflow//tensorflow:macos": [
"@mkl_darwin//:mkl_headers",
"@mkl_darwin//:mkl_libs_darwin",
],
diff --git a/third_party/mkl_dnn/mkldnn.BUILD b/third_party/mkl_dnn/mkldnn.BUILD
index bd842b87f8d..6e2e676c746 100644
--- a/third_party/mkl_dnn/mkldnn.BUILD
+++ b/third_party/mkl_dnn/mkldnn.BUILD
@@ -56,7 +56,7 @@ cc_library(
"@mkl_linux//:mkl_headers",
"@mkl_linux//:mkl_libs_linux",
],
- "@org_tensorflow//tensorflow:darwin": [
+ "@org_tensorflow//tensorflow:macos": [
"@mkl_darwin//:mkl_headers",
"@mkl_darwin//:mkl_libs_darwin",
],
diff --git a/third_party/mpi_collectives/BUILD b/third_party/mpi_collectives/BUILD
index d5f9edb0b99..89d676baff7 100644
--- a/third_party/mpi_collectives/BUILD
+++ b/third_party/mpi_collectives/BUILD
@@ -19,7 +19,7 @@ filegroup(
cc_library(
name = "mpi",
srcs = select({
- "//tensorflow:darwin": ["libmpi.dylib"],
+ "//tensorflow:macos": ["libmpi.dylib"],
"//conditions:default": ["libmpi.so"],
}),
hdrs = [
diff --git a/third_party/sqlite.BUILD b/third_party/sqlite.BUILD
index 8b876fb56fd..15cb6abced4 100644
--- a/third_party/sqlite.BUILD
+++ b/third_party/sqlite.BUILD
@@ -14,7 +14,7 @@ SQLITE_COPTS = [
"@org_tensorflow//tensorflow:windows": [
"-DSQLITE_MAX_TRIGGER_DEPTH=100",
],
- "@org_tensorflow//tensorflow:darwin": [
+ "@org_tensorflow//tensorflow:macos": [
"-Os",
"-DHAVE_GMTIME_R=1",
"-DHAVE_LOCALTIME_R=1",