Skip to content

Commit 0c2b067

Browse files
committed
generate-copyright: pass the source root from bootstrap
1 parent 33d92df commit 0c2b067

File tree

2 files changed

+5
-3
lines changed
  • src
    • bootstrap/src/core/build_steps
    • tools/generate-copyright/src

2 files changed

+5
-3
lines changed

src/bootstrap/src/core/build_steps/run.rs

+1
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ impl Step for GenerateCopyright {
217217
cmd.env("DEST", &dest);
218218
cmd.env("DEST_LIBSTD", &dest_libstd);
219219
cmd.env("OUT_DIR", &builder.out);
220+
cmd.env("SRC_DIR", &builder.src);
220221
cmd.env("CARGO", &builder.initial_cargo);
221222
// it is important that generate-copyright runs from the root of the
222223
// source tree, because it uses relative paths

src/tools/generate-copyright/src/main.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ fn main() -> Result<(), Error> {
1818
let dest_file = env_path("DEST")?;
1919
let libstd_dest_file = env_path("DEST_LIBSTD")?;
2020
let out_dir = env_path("OUT_DIR")?;
21+
let src_dir = env_path("SRC_DIR")?;
2122
let cargo = env_path("CARGO")?;
2223
let license_metadata = env_path("LICENSE_METADATA")?;
2324

@@ -27,7 +28,7 @@ fn main() -> Result<(), Error> {
2728
let mut collected_cargo_metadata = cargo_metadata::get_metadata_and_notices(
2829
&cargo,
2930
&out_dir.join("vendor"),
30-
&root_path,
31+
&src_dir,
3132
&[
3233
Path::new("./Cargo.toml"),
3334
Path::new("./src/tools/cargo/Cargo.toml"),
@@ -38,7 +39,7 @@ fn main() -> Result<(), Error> {
3839
let library_collected_cargo_metadata = cargo_metadata::get_metadata_and_notices(
3940
&cargo,
4041
&out_dir.join("library-vendor"),
41-
&root_path,
42+
&src_dir,
4243
&[Path::new("./library/Cargo.toml")],
4344
)?;
4445

@@ -54,7 +55,7 @@ fn main() -> Result<(), Error> {
5455
let library_collected_tree_metadata = Metadata {
5556
files: collected_tree_metadata
5657
.files
57-
.trim_clone(&Path::new("./library"), &Path::new("."))
58+
.trim_clone(&src_dir.join("library"), &src_dir)
5859
.unwrap(),
5960
};
6061

0 commit comments

Comments
 (0)