fix autocfg

rust-lang · Apr 26, 2023 · 4528695 · 4528695
1 parent 0496037
commit 4528695
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/collector/compile-benchmarks/cargo-0.60.0/1-feature.patch 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
@@ -16,6 +16,14 @@ fn determinism_env(cmd: &mut Command) {
     // what the actual change between two artifacts is.
     cmd.env("RUSTC_FORCE_INCR_COMP_ARTIFACT_HEADER", "rustc-perf");
     cmd.env("RUSTC_FORCE_RUSTC_VERSION", "rustc-perf");
+
+    // fix rustc
+    if let Some(rustc) = env::var_os("RUSTC_REAL") {
+        cmd.env("RUSTC", rustc);
+    }
+    if let Some(rustdoc) = env::var_os("RUSTDOC_REAL") {
+        cmd.env("RUSTDOC", rustdoc);
+    }
 }
 
 fn run_with_determinism_env(mut cmd: Command) {