Skip to content

Commit

Permalink
Set CARGO_WORKSPACE_DIR directly in prepare_tool_cargo
Browse files Browse the repository at this point in the history
  • Loading branch information
fasterthanlime committed Jul 19, 2022
1 parent 4f37325 commit 9c766ad
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/bootstrap/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,10 @@ pub fn prepare_tool_cargo(
}
}

// cargo doesn't set this env var yet, but it's needed by expect-test
// to build correct absolute paths for test_data files
cargo.env("CARGO_WORKSPACE_DIR", &dir);

// clippy tests need to know about the stage sysroot. Set them consistently while building to
// avoid rebuilding when running tests.
cargo.env("SYSROOT", builder.sysroot(compiler));
Expand Down

0 comments on commit 9c766ad

Please sign in to comment.