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

Fix --target getting passed twice to the Android NDK clang on Windows #705

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Fix --target getting passed twice to the Android NDK clang on Windows #705

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
8 changes: 5 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ pub struct Tool {
family: ToolFamily,
cuda: bool,
removed_args: Vec<OsString>,
has_internal_target_arg: bool,
}

/// Represents the family of tools this tool belongs to.
Expand Down Expand Up @@ -1824,9 +1825,7 @@ impl Build {
// Target flags
match cmd.family {
ToolFamily::Clang => {
if !(target.contains("android")
&& android_clang_compiler_uses_target_arg_internally(&cmd.path))
{
if !(target.contains("android") && cmd.has_internal_target_arg) {
if target.contains("darwin") {
if let Some(arch) =
map_darwin_target_from_rust_to_compiler_architecture(target)
Expand Down Expand Up @@ -2696,6 +2695,7 @@ impl Build {
let file_name = path.to_str().unwrap().to_owned();
let (target, clang) = file_name.split_at(file_name.rfind("-").unwrap());

tool.has_internal_target_arg = true;
tool.path.set_file_name(clang.trim_start_matches("-"));
tool.path.set_extension("exe");
tool.args.push(format!("--target={}", target).into());
Expand Down Expand Up @@ -3522,6 +3522,7 @@ impl Tool {
family: family,
cuda: false,
removed_args: Vec::new(),
has_internal_target_arg: false,
}
}

Expand Down Expand Up @@ -3582,6 +3583,7 @@ impl Tool {
family: family,
cuda: cuda,
removed_args: Vec::new(),
has_internal_target_arg: false,
}
}

Expand Down