Skip to content

Generate toolchain name inside condition #7024

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
LucasSte merged 1 commit into from
Jul 17, 2025
Merged

Generate toolchain name inside condition #7024

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
7 changes: 4 additions & 3 deletions platform-tools-sdk/cargo-build-sbf/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,12 @@ fn invoke_cargo(config: &Config, validated_toolchain_version: String) {

let cargo_build = PathBuf::from("cargo");
let mut cargo_build_args = vec![];
let toolchain_name = generate_toolchain_name(validated_toolchain_version.as_str());
let toolchain_argument = format!("+{toolchain_name}");

let mut toolchain_name: String;
if !config.no_rustup_override {
cargo_build_args.push(toolchain_argument.as_str());
toolchain_name = generate_toolchain_name(validated_toolchain_version.as_str());
toolchain_name = format!("+{toolchain_name}");
cargo_build_args.push(toolchain_name.as_str());
};

cargo_build_args.append(&mut vec!["build", "--release", "--target", &target_triple]);
Expand Down
Loading