Skip to content

Fix opt-dist CLI flag and make it work without LLD #139894

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

Merged
merged 2 commits into from
Apr 17, 2025
Merged

Fix opt-dist CLI flag and make it work without LLD #139894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd9bd38
Allow disabling `--llvm-shared` in opt-dist
Kobzol Apr 16, 2025
6f386e7
Only delete the lld directory if it exists
Kobzol Apr 16, 2025
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
2 changes: 1 addition & 1 deletion src/tools/opt-dist/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ enum EnvironmentCmd {
rustc_perf_checkout_dir: Option<Utf8PathBuf>,

/// Is LLVM for `rustc` built in shared library mode?
#[arg(long, default_value_t = true)]
#[arg(long, default_value_t = true, action(clap::ArgAction::Set))]
llvm_shared: bool,

/// Should BOLT optimization be used? If yes, host LLVM must have BOLT binaries
Expand Down
4 changes: 3 additions & 1 deletion src/tools/opt-dist/src/utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ pub fn clear_llvm_files(env: &Environment) -> anyhow::Result<()> {
// directories ourselves.
log::info!("Clearing LLVM build files");
delete_directory(&env.build_artifacts().join("llvm"))?;
delete_directory(&env.build_artifacts().join("lld"))?;
if env.build_artifacts().join("lld").is_dir() {
delete_directory(&env.build_artifacts().join("lld"))?;
}
Ok(())
}

Expand Down
Loading