Skip to content

Commit

Permalink
Rollup merge of rust-lang#105904 - MarcusCalhoun-Lopez:darwin_arch_i3…
Browse files Browse the repository at this point in the history
…86, r=bjorn3

Fix arch flag on i686-apple-darwin

i686-apple-darwin should use `-arch i386` instead of `-arch i686`
  • Loading branch information
fee1-dead committed Dec 21, 2022
2 parents a270e40 + ee1a905 commit 0e25271
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,9 @@ fn configure_cmake(
if target.starts_with("aarch64") {
// macOS uses a different name for building arm64
cfg.define("CMAKE_OSX_ARCHITECTURES", "arm64");
} else if target.starts_with("i686") {
// macOS uses a different name for building i386
cfg.define("CMAKE_OSX_ARCHITECTURES", "i386");
} else {
cfg.define("CMAKE_OSX_ARCHITECTURES", target.triple.split('-').next().unwrap());
}
Expand Down

0 comments on commit 0e25271

Please sign in to comment.