diff --git a/collector/compile-benchmarks/cargo-0.60.0/1-feature.patch b/collector/compile-benchmarks/cargo-0.60.0/1-feature.patch new file mode 100644 index 000000000..7ab8df4b1 --- /dev/null +++ b/collector/compile-benchmarks/cargo-0.60.0/1-feature.patch @@ -0,0 +1,12 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 12ee1eec..9a92219e 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -205,6 +205,7 @@ version = "0.4.26" + default-features = false + + [features] ++default = [ "vendored-openssl" ] + deny-warnings = [] + pretty-env-logger = ["pretty_env_logger"] + vendored-openssl = ["openssl/vendored"] diff --git a/collector/src/bin/rustc-fake.rs b/collector/src/bin/rustc-fake.rs index 68fe52c78..312b676d4 100644 --- a/collector/src/bin/rustc-fake.rs +++ b/collector/src/bin/rustc-fake.rs @@ -32,16 +32,17 @@ fn main() { let mut args_os = env::args_os(); let name = args_os.next().unwrap().into_string().unwrap(); - let mut args = args_os.collect::>(); - let rustc = env::var_os("RUSTC_REAL").unwrap(); let actually_rustdoc = name.ends_with("rustdoc-fake"); let tool = if actually_rustdoc { let rustdoc = env::var_os("RUSTDOC_REAL").unwrap(); rustdoc } else { - rustc + // rustc + args_os.next().unwrap() }; + let mut args = args_os.collect::>(); + if let Some(count) = env::var("RUSTC_THREAD_COUNT") .ok() .and_then(|v| v.parse::().ok()) diff --git a/collector/src/execute/mod.rs b/collector/src/execute/mod.rs index 2a6a5bb7d..d6af6a453 100644 --- a/collector/src/execute/mod.rs +++ b/collector/src/execute/mod.rs @@ -148,8 +148,8 @@ impl<'a> CargoProcess<'a> { cmd // Not all cargo invocations (e.g. `cargo clean`) need all of these // env vars set, but it doesn't hurt to have them. - .env("RUSTC", &*FAKE_RUSTC) - .env("RUSTC_REAL", &self.compiler.rustc) + .env("RUSTC_WRAPPER", &*FAKE_RUSTC) + .env("RUSTC", &self.compiler.rustc) // We separately pass -Cincremental to the leaf crate -- // CARGO_INCREMENTAL is cached separately for both the leaf crate // and any in-tree dependencies, and we don't want that; it wastes