@@ -32,12 +32,14 @@ fn benchmark_simple_raytracer(dirs: &Dirs, bootstrap_host_compiler: &Compiler) {
32
32
std:: process:: exit ( 1 ) ;
33
33
}
34
34
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
+ }
41
43
42
44
eprintln ! ( "[LLVM BUILD] simple-raytracer" ) ;
43
45
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) {
64
66
let target_dir = SIMPLE_RAYTRACER . target_dir ( dirs) ;
65
67
66
68
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}" ,
68
70
manifest_path = manifest_path. display( ) ,
69
71
target_dir = target_dir. display( ) ,
70
72
) ;
71
73
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}" ,
73
75
manifest_path = manifest_path. display( ) ,
74
76
target_dir = target_dir. display( ) ,
75
77
) ;
76
78
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}" ,
78
80
cargo_clif = cargo_clif. display( ) ,
79
81
manifest_path = manifest_path. display( ) ,
80
82
target_dir = target_dir. display( ) ,
0 commit comments