Fix CARGO_MANIFEST_DIR when transform_sources moves crate root to bazel-out#3953
Open
0xbeefd1ed wants to merge 1 commit intobazelbuild:mainfrom
Open
Fix CARGO_MANIFEST_DIR when transform_sources moves crate root to bazel-out#39530xbeefd1ed wants to merge 1 commit intobazelbuild:mainfrom
0xbeefd1ed wants to merge 1 commit intobazelbuild:mainfrom
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
When a rust_library (or similar rule) has a mix of generated and non-generated files in compile_data,
transform_sourcessymlinks all source files intobazel-out/. However, CARGO_MANIFEST_DIR was still computed fromctx.label.workspace_rootandctx.label.package, pointing to the original source directory. This caused proc-macros that readCargo.toml(e.g., Bevy's#[derive(Component)]) to fail with "Cargo manifest does not exist" errors in sandboxed builds on Linux / macOS.This change derives
CARGO_MANIFEST_DIRfrom the actual crate root location when the crate root has been transformed, usingcrate_info.root.root.pathcombined with the package path.Reproduction
Cargo.tomlviaCARGO_MANIFEST_DIR(e.g., Bevy's derive macros)Cargo.tomlis not found at theCARGO_MANIFEST_DIRpathFix
crate_info.root.is_source, use the existing label-based path (no behavior change)crate_info.root.root.path+ the workspace/package path, which reflects the actual bazel-out/ layoutDisclosure
This PR was created with assistance from Claude Code.