remove changes incompatible with older versions of Bazel

bazel-contrib · Sep 11, 2024 · eb5d156 · eb5d156
1 parent 14bb720
commit eb5d156
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/cuda/private/rules/cuda_library.bzl b/cuda/private/rules/cuda_library.bzl
@@ -1,10 +1,10 @@
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load("//cuda/private:actions/compile.bzl", "compile")
 load("//cuda/private:actions/dlink.bzl", "device_link")
 load("//cuda/private:cuda_helper.bzl", "cuda_helper")
 load("//cuda/private:providers.bzl", "CudaInfo")
 load("//cuda/private:rules/common.bzl", "ALLOW_CUDA_HDRS", "ALLOW_CUDA_SRCS")
-load("//cuda/private:toolchain.bzl", "find_cuda_toolchain", "use_cuda_toolchain")
+load("//cuda/private:toolchain.bzl", "find_cuda_toolchain", "use_cpp_toolchain", "use_cuda_toolchain")
 
 def _cuda_library_impl(ctx):
     """cuda_library is a rule that perform device link.
@@ -175,6 +175,6 @@ cuda_library = rule(
         "_default_cuda_archs": attr.label(default = "//cuda:archs"),
     },
     fragments = ["cpp"],
-    toolchains = use_cpp_toolchain(mandatory = True) + use_cuda_toolchain(),
+    toolchains = use_cpp_toolchain() + use_cuda_toolchain(),
     provides = [DefaultInfo, OutputGroupInfo, CcInfo, CudaInfo],
 )
diff --git a/cuda/private/rules/cuda_objects.bzl b/cuda/private/rules/cuda_objects.bzl
@@ -1,9 +1,9 @@
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load("//cuda/private:actions/compile.bzl", "compile")
 load("//cuda/private:cuda_helper.bzl", "cuda_helper")
 load("//cuda/private:providers.bzl", "CudaInfo")
 load("//cuda/private:rules/common.bzl", "ALLOW_CUDA_HDRS", "ALLOW_CUDA_SRCS")
-load("//cuda/private:toolchain.bzl", "find_cuda_toolchain", "use_cuda_toolchain")
+load("//cuda/private:toolchain.bzl", "find_cuda_toolchain", "use_cpp_toolchain", "use_cuda_toolchain")
 
 def _cuda_objects_impl(ctx):
     attr = ctx.attr
@@ -110,6 +110,6 @@ code and device link time optimization source files.""",
         "_default_cuda_archs": attr.label(default = "//cuda:archs"),
     },
     fragments = ["cpp"],
-    toolchains = use_cpp_toolchain(mandatory = True) + use_cuda_toolchain(),
+    toolchains = use_cpp_toolchain() + use_cuda_toolchain(),
     provides = [DefaultInfo, OutputGroupInfo, CcInfo, CudaInfo],
 )
diff --git a/cuda/private/toolchain_configs/clang.bzl b/cuda/private/toolchain_configs/clang.bzl
@@ -1,9 +1,10 @@
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load("//cuda/private:action_names.bzl", "ACTION_NAMES")
 load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES")
 load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo")
+load("//cuda/private:toolchain.bzl", "use_cpp_toolchain")
 load(
     "//cuda/private:toolchain_config_lib.bzl",
     "action_config",
@@ -515,6 +516,6 @@ cuda_toolchain_config = rule(
         "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"),  # legacy behaviour
     },
     provides = [CudaToolchainConfigInfo],
-    toolchains = use_cpp_toolchain(mandatory = True),
+    toolchains = use_cpp_toolchain(),
     fragments = ["cpp"],
 )
diff --git a/cuda/private/toolchain_configs/nvcc.bzl b/cuda/private/toolchain_configs/nvcc.bzl
@@ -1,9 +1,10 @@
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load("//cuda/private:action_names.bzl", "ACTION_NAMES")
 load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES")
 load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo")
+load("//cuda/private:toolchain.bzl", "use_cpp_toolchain")
 load(
     "//cuda/private:toolchain_config_lib.bzl",
     "action_config",
@@ -525,6 +526,6 @@ cuda_toolchain_config = rule(
         "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"),  # legacy behaviour
     },
     provides = [CudaToolchainConfigInfo],
-    toolchains = use_cpp_toolchain(mandatory = True),
+    toolchains = use_cpp_toolchain(),
     fragments = ["cpp"],
 )
diff --git a/cuda/private/toolchain_configs/nvcc_msvc.bzl b/cuda/private/toolchain_configs/nvcc_msvc.bzl
@@ -1,9 +1,10 @@
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES")
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load("//cuda/private:action_names.bzl", "ACTION_NAMES")
 load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES")
 load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo")
+load("//cuda/private:toolchain.bzl", "use_cpp_toolchain")
 load(
     "//cuda/private:toolchain_config_lib.bzl",
     "action_config",
@@ -613,6 +614,6 @@ cuda_toolchain_config = rule(
         "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"),  # legacy behaviour
     },
     provides = [CudaToolchainConfigInfo],
-    toolchains = use_cpp_toolchain(mandatory = True),
+    toolchains = use_cpp_toolchain(),
     fragments = ["cpp"],
 )