|
33 | 33 | "can_build_metadata", |
34 | 34 | "can_use_metadata_for_pipelining", |
35 | 35 | "compute_crate_name", |
| 36 | + "crate_root_from_build_scripts", |
36 | 37 | "crate_root_src", |
37 | 38 | "dedent", |
38 | 39 | "deduplicate", |
@@ -169,7 +170,7 @@ def _rust_library_common(ctx, crate_type): |
169 | 170 |
|
170 | 171 | crate_root = getattr(ctx.file, "crate_root", None) |
171 | 172 | if not crate_root: |
172 | | - crate_root = crate_root_src(ctx.attr.name, ctx.attr.crate_name, ctx.files.srcs, crate_type) |
| 173 | + crate_root = crate_root_from_build_scripts(ctx) or crate_root_src(ctx.attr.name, ctx.attr.crate_name, ctx.files.srcs, crate_type) |
173 | 174 | srcs, compile_data, crate_root = transform_sources(ctx, ctx.files.srcs, ctx.files.compile_data, crate_root) |
174 | 175 |
|
175 | 176 | # Determine unique hash for this rlib. |
@@ -265,7 +266,7 @@ def _rust_binary_impl(ctx): |
265 | 266 |
|
266 | 267 | crate_root = getattr(ctx.file, "crate_root", None) |
267 | 268 | if not crate_root: |
268 | | - crate_root = crate_root_src(ctx.attr.name, ctx.attr.crate_name, ctx.files.srcs, ctx.attr.crate_type) |
| 269 | + crate_root = crate_root_from_build_scripts(ctx) or crate_root_src(ctx.attr.name, ctx.attr.crate_name, ctx.files.srcs, ctx.attr.crate_type) |
269 | 270 | srcs, compile_data, crate_root = transform_sources(ctx, ctx.files.srcs, ctx.files.compile_data, crate_root) |
270 | 271 |
|
271 | 272 | rust_metadata = None |
|
0 commit comments