diff options
| author | bors <bors@rust-lang.org> | 2024-05-14 17:57:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-14 17:57:11 +0000 |
| commit | 8387315ab3c26a57a1f53a90f188f0bc88514bca (patch) | |
| tree | 6a748c2ce1c40c1fe78fc526e652250d924ebeb1 | |
| parent | ac385a5af6d9fa8399a0cec799833cd28324abf8 (diff) | |
| parent | c3c9783de2f6cbfaaaeaea91e603238b386b3f2e (diff) | |
Auto merge of #125125 - lovesegfault:opt-dist-specify-rustc-perf, r=Mark-Simulacrum
feat(tools/opt-dist): allow local builds to specify a rustc-perf checkout This is a first step towards allowing `opt-dist` to work in a sandboxed / air-gapped environment, as it allows users to bypass the ad-hoc download of `rustc-perf`.
| -rw-r--r-- | src/tools/opt-dist/src/main.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/opt-dist/src/main.rs b/src/tools/opt-dist/src/main.rs index ffb01210e04..bd0a3815855 100644 --- a/src/tools/opt-dist/src/main.rs +++ b/src/tools/opt-dist/src/main.rs @@ -69,6 +69,10 @@ enum EnvironmentCmd { #[arg(long, default_value = "opt-artifacts")] artifact_dir: Utf8PathBuf, + /// Checkout directory of `rustc-perf`, it will be fetched automatically if unspecified. + #[arg(long)] + rustc_perf_checkout_dir: Option<Utf8PathBuf>, + /// Is LLVM for `rustc` built in shared library mode? #[arg(long, default_value_t = true)] llvm_shared: bool, @@ -109,6 +113,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)> llvm_dir, python, artifact_dir, + rustc_perf_checkout_dir, llvm_shared, use_bolt, skipped_tests, @@ -121,6 +126,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)> .host_llvm_dir(llvm_dir) .artifact_dir(artifact_dir) .build_dir(checkout_dir) + .prebuilt_rustc_perf(rustc_perf_checkout_dir) .shared_llvm(llvm_shared) .use_bolt(use_bolt) .skipped_tests(skipped_tests) |
