diff --git a/mojo/private/mojo_binary_test.bzl b/mojo/private/mojo_binary_test.bzl index e3b6a0c..9f86ed6 100644 --- a/mojo/private/mojo_binary_test.bzl +++ b/mojo/private/mojo_binary_test.bzl @@ -4,6 +4,8 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain") load("@build_bazel_rules_android//:link_hack.bzl", "link_hack") # See link_hack.bzl for details +load("@rules_cc//cc/common:cc_common.bzl", "cc_common") +load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load("@rules_python//python:py_info.bzl", "PyInfo") load("//mojo:providers.bzl", "MojoInfo") load(":transitions.bzl", "python_version_transition") diff --git a/mojo/private/utils.bzl b/mojo/private/utils.bzl index 4bbfcaf..84d1ae5 100644 --- a/mojo/private/utils.bzl +++ b/mojo/private/utils.bzl @@ -1,10 +1,18 @@ """Helpers internal to rules_mojo.""" -load("//mojo:providers.bzl", "MojoInfo", "MojoToolchainInfo") +load("//mojo:providers.bzl", "MojoInfo") MOJO_EXTENSIONS = ("mojo", "🔥") def collect_mojoinfo(deps): + """Get a combined MojoInfo from all the passed dependencies. + + Args: + deps: A list of dependencies to collect MojoInfo from. + + Returns: + A single MojoInfo object with the combined data. + """ import_paths = [] mojopkgs = [] for dep in deps: diff --git a/mojo/toolchain.bzl b/mojo/toolchain.bzl index 0884b69..2214cb7 100644 --- a/mojo/toolchain.bzl +++ b/mojo/toolchain.bzl @@ -1,5 +1,6 @@ """The Mojo compiler toolchain.""" +load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load("//mojo:providers.bzl", "MojoInfo", "MojoToolchainInfo") def _mojo_toolchain_impl(ctx):