Skip to content

Commit

Permalink
Merge pull request #199 from rust-cross/fix-cc
Browse files Browse the repository at this point in the history
Remove `--target` argument from `cc-rs`
  • Loading branch information
messense authored Nov 13, 2023
2 parents 20bee12 + 6c10ea6 commit 6a84f96
Show file tree
Hide file tree
Showing 3 changed files with 158 additions and 46 deletions.
7 changes: 5 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/zig.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ impl Zig {
if arg == "-lgcc_s" {
// Replace libgcc_s with libunwind
return Some("-lunwind".to_string());
} else if arg.starts_with("--target=") {
// We have already passed target via `-target`
return None;
}
if (is_arm || is_windows_gnu)
&& arg.ends_with(".rlib")
Expand Down
Loading

0 comments on commit 6a84f96

Please sign in to comment.