Skip to content

Commit

Permalink
Auto merge of #125125 - lovesegfault:opt-dist-specify-rustc-perf, r=M…
Browse files Browse the repository at this point in the history
…ark-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`.
  • Loading branch information
bors committed May 14, 2024
2 parents ac385a5 + c3c9783 commit 8387315
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/tools/opt-dist/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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)
Expand Down

0 comments on commit 8387315

Please sign in to comment.