@@ -32,12 +32,14 @@ fn benchmark_simple_raytracer(dirs: &Dirs, bootstrap_host_compiler: &Compiler) {
3232 std:: process:: exit ( 1 ) ;
3333 }
3434
35- SIMPLE_RAYTRACER_REPO . fetch ( dirs) ;
36- spawn_and_wait ( SIMPLE_RAYTRACER . fetch (
37- & bootstrap_host_compiler. cargo ,
38- & bootstrap_host_compiler. rustc ,
39- dirs,
40- ) ) ;
35+ if !SIMPLE_RAYTRACER_REPO . source_dir ( ) . to_path ( dirs) . exists ( ) {
36+ SIMPLE_RAYTRACER_REPO . fetch ( dirs) ;
37+ spawn_and_wait ( SIMPLE_RAYTRACER . fetch (
38+ & bootstrap_host_compiler. cargo ,
39+ & bootstrap_host_compiler. rustc ,
40+ dirs,
41+ ) ) ;
42+ }
4143
4244 eprintln ! ( "[LLVM BUILD] simple-raytracer" ) ;
4345 let build_cmd = SIMPLE_RAYTRACER_LLVM . build ( bootstrap_host_compiler, dirs) ;
@@ -64,17 +66,17 @@ fn benchmark_simple_raytracer(dirs: &Dirs, bootstrap_host_compiler: &Compiler) {
6466 let target_dir = SIMPLE_RAYTRACER . target_dir ( dirs) ;
6567
6668 let clean_cmd = format ! (
67- "cargo clean --manifest-path {manifest_path} --target-dir {target_dir}" ,
69+ "RUSTC=rustc cargo clean --manifest-path {manifest_path} --target-dir {target_dir}" ,
6870 manifest_path = manifest_path. display( ) ,
6971 target_dir = target_dir. display( ) ,
7072 ) ;
7173 let llvm_build_cmd = format ! (
72- "cargo build --manifest-path {manifest_path} --target-dir {target_dir}" ,
74+ "RUSTC=rustc cargo build --manifest-path {manifest_path} --target-dir {target_dir}" ,
7375 manifest_path = manifest_path. display( ) ,
7476 target_dir = target_dir. display( ) ,
7577 ) ;
7678 let clif_build_cmd = format ! (
77- "{cargo_clif} build --manifest-path {manifest_path} --target-dir {target_dir}" ,
79+ "RUSTC=rustc {cargo_clif} build --manifest-path {manifest_path} --target-dir {target_dir}" ,
7880 cargo_clif = cargo_clif. display( ) ,
7981 manifest_path = manifest_path. display( ) ,
8082 target_dir = target_dir. display( ) ,
0 commit comments