Skip to content

Support build_env, runtime_env, and extra_runfiles in mojo toolchain #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ahajha merged 1 commit into from
Mar 20, 2026
Merged

Support build_env, runtime_env, and extra_runfiles in mojo toolchain #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mojo/mojo_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def _format_include(arg):

def _mojo_library_implementation(ctx):
mojo_toolchain = ctx.toolchains["//:toolchain_type"].mojo_toolchain_info
build_env = getattr(ctx.toolchains["//:toolchain_type"], "build_env", {})

mojo_package = ctx.actions.declare_file(ctx.label.name + ".mojopkg")
args = ctx.actions.args()
Expand Down Expand Up @@ -54,7 +55,7 @@ def _mojo_library_implementation(ctx):
"MODULAR_CRASH_REPORTING_ENABLED": "false",
"PATH": "/dev/null", # Avoid using the host's PATH
"TEST_TMPDIR": ".", # Make sure any cache files are written to somewhere bazel will cleanup
},
} | build_env,
use_default_shell_env = True,
toolchain = "//:toolchain_type",
execution_requirements = {
Expand Down
8 changes: 7 additions & 1 deletion mojo/private/mojo_binary_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ def _find_main(name, srcs, main):
def _mojo_binary_test_implementation(ctx, *, shared_library = False):
cc_toolchain = find_cpp_toolchain(ctx)
mojo_toolchain = ctx.exec_groups["mojo_compile"].toolchains["//:toolchain_type"].mojo_toolchain_info
build_env = getattr(ctx.exec_groups["mojo_compile"].toolchains["//:toolchain_type"], "build_env", {})
runtime_env_extra = getattr(ctx.exec_groups["mojo_compile"].toolchains["//:toolchain_type"], "runtime_env", {})
extra_runfiles = getattr(ctx.exec_groups["mojo_compile"].toolchains["//:toolchain_type"], "extra_runfiles", [])
py_toolchain = ctx.toolchains[_PYTHON_TOOLCHAIN_TYPE]

object_file = ctx.actions.declare_file(ctx.label.name + ".lo")
Expand Down Expand Up @@ -154,7 +157,7 @@ def _mojo_binary_test_implementation(ctx, *, shared_library = False):
"MODULAR_MOJO_MAX_LLD_PATH": mojo_toolchain.lld.path,
"PATH": "/dev/null", # Avoid using the host's PATH
"TEST_TMPDIR": ".",
},
} | build_env,
use_default_shell_env = True,
exec_group = "mojo_compile",
toolchain = "//:toolchain_type",
Expand Down Expand Up @@ -200,6 +203,8 @@ def _mojo_binary_test_implementation(ctx, *, shared_library = False):
transitive_runfiles = [
ctx.runfiles(transitive_files = py_toolchain.py3_runtime.files),
]
if extra_runfiles:
transitive_runfiles.append(ctx.runfiles(files = extra_runfiles))
for target in data:
transitive_runfiles.append(target[DefaultInfo].default_runfiles)

Expand Down Expand Up @@ -248,6 +253,7 @@ def _mojo_binary_test_implementation(ctx, *, shared_library = False):
"PYTHONPATH": python_path,
"PYTHONSAFEPATH": "affirmative",
}
runtime_env.update(runtime_env_extra)
for key, value in runtime_env.items():
runtime_env[key] = ctx.expand_make_variables(
"env",
Expand Down
Loading