Skip to content

Commit 527f0eb

Browse files
Run x.py under python3
This ensures that we can consume xz artifacts, needed for CI LLVM use.
1 parent 7e88334 commit 527f0eb

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

collector/src/execute/rustc.rs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,23 @@ fn record(
8484
assert!(status.success(), "configure successful");
8585

8686
let output = collector::command_output(
87-
Command::new(
88-
checkout
89-
.join("x.py")
90-
.canonicalize()
91-
.context("x.py script canonicalize")?,
92-
)
93-
.current_dir(&checkout)
94-
.env("RUSTC_PERF_REAL_RUSTC", &compiler.rustc)
95-
.arg("build")
96-
.arg("--stage")
97-
.arg("0")
98-
// We want bootstrap and the Cargos it spawns to have no parallelism --
99-
// if multiple rustcs are competing for jobserver tokens, we introduce
100-
// quite a bit of variance.
101-
.arg("-j1")
102-
.arg("compiler/rustc"),
87+
Command::new("python3")
88+
.arg(
89+
checkout
90+
.join("x.py")
91+
.canonicalize()
92+
.context("x.py script canonicalize")?,
93+
)
94+
.current_dir(&checkout)
95+
.env("RUSTC_PERF_REAL_RUSTC", &compiler.rustc)
96+
.arg("build")
97+
.arg("--stage")
98+
.arg("0")
99+
// We want bootstrap and the Cargos it spawns to have no parallelism --
100+
// if multiple rustcs are competing for jobserver tokens, we introduce
101+
// quite a bit of variance.
102+
.arg("-j1")
103+
.arg("compiler/rustc"),
103104
)
104105
.context("building rustc")?;
105106

0 commit comments

Comments
 (0)