Skip to content

Fix CARGO_MANIFEST_DIR when transform_sources moves crate root to bazel-out #3953

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

Open
0xbeefd1ed wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −1
Open

Fix CARGO_MANIFEST_DIR when transform_sources moves crate root to bazel-out #3953

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
16 changes: 15 additions & 1 deletion rust/private/rustc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,21 @@ def construct_arguments(

# Both ctx.label.workspace_root and ctx.label.package are relative paths
# and either can be empty strings. Avoid trailing/double slashes in the path.
components = "${{pwd}}/{}/{}".format(ctx.label.workspace_root, ctx.label.package).split("/")
#
# When transform_sources moves source files into bazel-out (due to mixed
# generated/non-generated sources), the crate root ends up under a different
# directory than the original source package. We must derive CARGO_MANIFEST_DIR
# from the actual crate root path so proc-macros can find Cargo.toml in the
# sandbox.
_package_path = "/".join([c for c in [ctx.label.workspace_root, ctx.label.package] if c])
if crate_info.root.is_source:
components = "${{pwd}}/{}/{}".format(ctx.label.workspace_root, ctx.label.package).split("/")
else:
# Crate root was transformed (symlinked into bazel-out). The file is at
# <root.root.path>/<workspace_root>/<package>/<relative_path>, so the
# manifest directory is <root.root.path>/<workspace_root>/<package>.
_manifest_dir = "/".join([c for c in [crate_info.root.root.path, _package_path] if c])
components = "${{pwd}}/{}".format(_manifest_dir).split("/")
env["CARGO_MANIFEST_DIR"] = "/".join([c for c in components if c])

if out_dir != None:
Expand Down
Loading