From 75d558d3fd3815c8ea923c76fd6c17be48a7b09c Mon Sep 17 00:00:00 2001 From: Marcel Hlopko Date: Mon, 18 Mar 2019 11:35:18 +0100 Subject: [PATCH] Migrate TF for https://github.com/bazelbuild/bazel/issues/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. --- third_party/gpus/crosstool/BUILD.tpl | 6 ------ third_party/sycl/crosstool/BUILD.tpl | 2 -- third_party/toolchains/clang6/clang.BUILD | 2 -- third_party/toolchains/cpus/arm/BUILD | 4 ---- .../preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/BUILD | 6 ------ .../preconfig/ubuntu14.04/gcc-nvcc-cuda9.0/BUILD | 6 ------ .../toolchains/preconfig/ubuntu14.04/gcc-nvcc/BUILD | 6 ------ .../preconfig/ubuntu14.04/gcc7-nvcc-cuda10.0/BUILD | 6 ------ third_party/toolchains/preconfig/ubuntu16.04/clang/BUILD | 4 ---- third_party/toolchains/preconfig/win_1803/bazel_018/BUILD | 8 -------- 10 files changed, 50 deletions(-) diff --git a/third_party/gpus/crosstool/BUILD.tpl b/third_party/gpus/crosstool/BUILD.tpl index db76306ffbe..0c5abf9d2b0 100644 --- a/third_party/gpus/crosstool/BUILD.tpl +++ b/third_party/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/third_party/sycl/crosstool/BUILD.tpl b/third_party/sycl/crosstool/BUILD.tpl index cd8df93cd64..72744334aaf 100755 --- a/third_party/sycl/crosstool/BUILD.tpl +++ b/third_party/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/third_party/toolchains/clang6/clang.BUILD b/third_party/toolchains/clang6/clang.BUILD index 802d62c17cc..094d69271a9 100644 --- a/third_party/toolchains/clang6/clang.BUILD +++ b/third_party/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/third_party/toolchains/cpus/arm/BUILD b/third_party/toolchains/cpus/arm/BUILD index efed6972395..36c09a38764 100644 --- a/third_party/toolchains/cpus/arm/BUILD +++ b/third_party/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/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/BUILD b/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/BUILD index 2b84b761ff9..4f24f58e62b 100755 --- a/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/BUILD +++ b/third_party/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/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda9.0/BUILD b/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda9.0/BUILD index 6442e7628a4..e6329148742 100755 --- a/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda9.0/BUILD +++ b/third_party/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/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc/BUILD b/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc/BUILD index 6442e7628a4..e6329148742 100755 --- a/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc/BUILD +++ b/third_party/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/third_party/toolchains/preconfig/ubuntu14.04/gcc7-nvcc-cuda10.0/BUILD b/third_party/toolchains/preconfig/ubuntu14.04/gcc7-nvcc-cuda10.0/BUILD index 2b84b761ff9..4f24f58e62b 100755 --- a/third_party/toolchains/preconfig/ubuntu14.04/gcc7-nvcc-cuda10.0/BUILD +++ b/third_party/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/third_party/toolchains/preconfig/ubuntu16.04/clang/BUILD b/third_party/toolchains/preconfig/ubuntu16.04/clang/BUILD index 5a0c52f66ab..a1d69cf2e3d 100755 --- a/third_party/toolchains/preconfig/ubuntu16.04/clang/BUILD +++ b/third_party/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/third_party/toolchains/preconfig/win_1803/bazel_018/BUILD b/third_party/toolchains/preconfig/win_1803/bazel_018/BUILD index edd95836481..dcb2980162d 100644 --- a/third_party/toolchains/preconfig/win_1803/bazel_018/BUILD +++ b/third_party/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",