File tree 1 file changed +2
-3
lines changed
1 file changed +2
-3
lines changed Original file line number Diff line number Diff line change @@ -1196,11 +1196,10 @@ impl<'a> Builder<'a> {
1196
1196
pub fn cargo_clippy_cmd ( & self , run_compiler : Compiler ) -> Command {
1197
1197
let initial_sysroot_bin = self . initial_rustc . parent ( ) . unwrap ( ) ;
1198
1198
// Set PATH to include the sysroot bin dir so clippy can find cargo.
1199
- // FIXME: once rust-clippy#11944 lands on beta, set `CARGO` directly instead.
1200
1199
let path = t ! ( env:: join_paths(
1201
1200
// The sysroot comes first in PATH to avoid using rustup's cargo.
1202
1201
std:: iter:: once( PathBuf :: from( initial_sysroot_bin) )
1203
- . chain( env:: split_paths( & t!( env:: var( "PATH " ) ) ) )
1202
+ . chain( env:: split_paths( & t!( env:: var( "CARGO " ) ) ) )
1204
1203
) ) ;
1205
1204
1206
1205
if run_compiler. stage == 0 {
@@ -1227,7 +1226,7 @@ impl<'a> Builder<'a> {
1227
1226
1228
1227
let mut cmd = Command :: new ( cargo_clippy) ;
1229
1228
cmd. env ( helpers:: dylib_path_var ( ) , env:: join_paths ( & dylib_path) . unwrap ( ) ) ;
1230
- cmd. env ( "PATH " , path) ;
1229
+ cmd. env ( "CARGO " , path) ;
1231
1230
cmd
1232
1231
}
1233
1232
You can’t perform that action at this time.
0 commit comments