Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use rustc-fake as RUSTC_WRAPPER #1576

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use rustc-fake as RUSTC_WRAPPER #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions collector/compile-benchmarks/cargo-0.60.0/1-feature.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
7 changes: 4 additions & 3 deletions collector/src/bin/rustc-fake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions collector/src/execute/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down