restore the RUSTC/RUSTDOC env after rustc-fake cmd substitution

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

Hide file tree

Showing 2 changed files with 16 additions and 3 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
@@ -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::<Vec<_>>();
-    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::<Vec<_>>();
+
     if let Some(count) = env::var("RUSTC_THREAD_COUNT")
         .ok()
         .and_then(|v| v.parse::<u32>().ok())