From fdba3bb8d9e0191a6b650200be064343fee90509 Mon Sep 17 00:00:00 2001 From: Alex Trotta Date: Fri, 31 Jul 2026 10:41:38 -0400 Subject: [PATCH 1/2] Fix import paths --- mojo/mojo_library.bzl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mojo/mojo_library.bzl b/mojo/mojo_library.bzl index deb4d46..20bd118 100644 --- a/mojo/mojo_library.bzl +++ b/mojo/mojo_library.bzl @@ -1,6 +1,7 @@ """Compile Mojo files into a precompiled object (mojoc) that can be consumed by other Mojo targets.""" +load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load("//mojo:providers.bzl", "MojoInfo") load("//mojo/private:utils.bzl", "MOJO_EXTENSIONS", "collect_mojoinfo", "format_import", "is_exec_config") @@ -8,8 +9,9 @@ load("//mojo/private:utils.bzl", "MOJO_EXTENSIONS", "collect_mojoinfo", "format_ def _format_include(arg): return ["-I", arg.dirname] -def _format_root(arg): - return arg.dirname +def _format_root_import(ctx): + package, import_path = ctx + return ["-I", paths.normalize(paths.join(package, import_path))] def _mojo_library_implementation(ctx): mojo_toolchain = ctx.toolchains["//:toolchain_type"].mojo_toolchain_info @@ -36,6 +38,8 @@ def _mojo_library_implementation(ctx): for file in ctx.files.srcs: if not file.dirname.startswith(root_directory): args.add_all([file], map_each = _format_include) + if ctx.attr.import_path != ".": + args.add_all([(ctx.label.package, ctx.attr.import_path)], map_each = _format_root_import) output_group_kwargs = {} precompile_outputs = [mojo_precmp_file] From 31d91cdaf45ccaff70611e1cbc6a85ef6f0bb4b5 Mon Sep 17 00:00:00 2001 From: Alex Trotta Date: Fri, 31 Jul 2026 10:46:15 -0400 Subject: [PATCH 2/2] readd --- mojo/mojo_library.bzl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mojo/mojo_library.bzl b/mojo/mojo_library.bzl index 20bd118..9765657 100644 --- a/mojo/mojo_library.bzl +++ b/mojo/mojo_library.bzl @@ -9,6 +9,9 @@ load("//mojo/private:utils.bzl", "MOJO_EXTENSIONS", "collect_mojoinfo", "format_ def _format_include(arg): return ["-I", arg.dirname] +def _format_root(arg): + return arg.dirname + def _format_root_import(ctx): package, import_path = ctx return ["-I", paths.normalize(paths.join(package, import_path))]