Migrate TF for bazelbuild/bazel#6942

Since Bazel 0.22 static_runtime_libs and dynamic_runtime_libs attributes are not mandatory, and since 0.23 they are replaced by their singluar siblings.
lngart · Mar 18, 2019 · 4aa5b4c · 4aa5b4c
1 parent 933c70e
commit 4aa5b4c
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 50 deletions.
diff --git a/gpus/crosstool/BUILD.tpl b/gpus/crosstool/BUILD.tpl
@@ -37,10 +37,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = "%{linker_files}",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     # To support linker flags that need to go to the start of command line
     # we need the toolchain to support parameter files. Parameter files are
@@ -56,10 +54,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "darwin",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = "%{linker_files}",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
     toolchain_identifier = "local_darwin",
@@ -71,10 +67,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = "%{win_linker_files}",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "local_windows",

diff --git a/sycl/crosstool/BUILD.tpl b/sycl/crosstool/BUILD.tpl
@@ -15,10 +15,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
 )

diff --git a/toolchains/clang6/clang.BUILD b/toolchains/clang6/clang.BUILD
@@ -152,11 +152,9 @@ cc_toolchain(
     compiler_files = ":compiler_files",
     cpu = "k8",
     dwp_files = ":dwp",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":linker_files",
     objcopy_files = ":objcopy",
     output_licenses = ["unencumbered"],
-    static_runtime_libs = [":empty"],
     strip_files = ":strip",
     supports_param_files = 1,
 )
diff --git a/toolchains/cpus/arm/BUILD b/toolchains/cpus/arm/BUILD
@@ -31,10 +31,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "local_linux",
@@ -46,10 +44,8 @@ cc_toolchain(
     compiler_files = ":arm_linux_all_files",
     cpu = "armeabi",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":arm_linux_all_files",
     objcopy_files = "arm_linux_all_files",
-    static_runtime_libs = [":empty"],
     strip_files = "arm_linux_all_files",
     supports_param_files = 1,
     toolchain_identifier = "arm-linux-gnueabihf",

diff --git a/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/BUILD b/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/BUILD
@@ -37,10 +37,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":crosstool_wrapper_driver_is_not_gcc",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     # To support linker flags that need to go to the start of command line
     # we need the toolchain to support parameter files. Parameter files are
@@ -56,10 +54,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "darwin",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":crosstool_wrapper_driver_is_not_gcc",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
     toolchain_identifier = "local_darwin",
@@ -71,10 +67,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":windows_msvc_wrapper_files",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "local_windows",

diff --git a/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda9.0/BUILD b/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda9.0/BUILD
@@ -31,10 +31,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":crosstool_wrapper_driver_is_not_gcc",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     # To support linker flags that need to go to the start of command line
     # we need the toolchain to support parameter files. Parameter files are
@@ -49,10 +47,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "darwin",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":crosstool_wrapper_driver_is_not_gcc",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
 )
@@ -63,10 +59,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":windows_msvc_wrapper_files",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
 )

diff --git a/toolchains/preconfig/ubuntu14.04/gcc-nvcc/BUILD b/toolchains/preconfig/ubuntu14.04/gcc-nvcc/BUILD
@@ -31,10 +31,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":crosstool_wrapper_driver_is_not_gcc",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     # To support linker flags that need to go to the start of command line
     # we need the toolchain to support parameter files. Parameter files are
@@ -49,10 +47,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "darwin",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":crosstool_wrapper_driver_is_not_gcc",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
 )
@@ -63,10 +59,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":windows_msvc_wrapper_files",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
 )

diff --git a/toolchains/preconfig/ubuntu14.04/gcc7-nvcc-cuda10.0/BUILD b/toolchains/preconfig/ubuntu14.04/gcc7-nvcc-cuda10.0/BUILD
@@ -37,10 +37,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":crosstool_wrapper_driver_is_not_gcc",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     # To support linker flags that need to go to the start of command line
     # we need the toolchain to support parameter files. Parameter files are
@@ -56,10 +54,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "darwin",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":crosstool_wrapper_driver_is_not_gcc",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
     toolchain_identifier = "local_darwin",
@@ -71,10 +67,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":windows_msvc_wrapper_files",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "local_windows",

diff --git a/toolchains/preconfig/ubuntu16.04/clang/BUILD b/toolchains/preconfig/ubuntu16.04/clang/BUILD
@@ -60,10 +60,8 @@ cc_toolchain(
     compiler_files = ":compiler_deps",
     cpu = "k8",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":compiler_deps",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "linux_gnu_x86",
@@ -88,10 +86,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "stub_armeabi-v7a",

diff --git a/toolchains/preconfig/win_1803/bazel_018/BUILD b/toolchains/preconfig/win_1803/bazel_018/BUILD
@@ -51,10 +51,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "msys_x64",
@@ -81,10 +79,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
     toolchain_identifier = "msys_x64_mingw",
@@ -111,10 +107,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "msvc_x64",
@@ -140,10 +134,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
     toolchain_identifier = "stub_armeabi-v7a",