diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-12-20 23:35:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-20 23:35:15 +0100 |
| commit | 2ddfa8fd3b5b7c1c4ffe63ecd3c513916e505174 (patch) | |
| tree | d7dabef56f64fdb2b0bcb2c955e3f8c9cc7096de | |
| parent | a4ef47d6b398b7d4012c9494463f6865aab77557 (diff) | |
| parent | ee1a905f00ab5ec426d45eb29e168a20dfe94498 (diff) | |
| download | rust-2ddfa8fd3b5b7c1c4ffe63ecd3c513916e505174.tar.gz rust-2ddfa8fd3b5b7c1c4ffe63ecd3c513916e505174.zip | |
Rollup merge of #105904 - MarcusCalhoun-Lopez:darwin_arch_i386, r=bjorn3
Fix arch flag on i686-apple-darwin i686-apple-darwin should use `-arch i386` instead of `-arch i686`
| -rw-r--r-- | src/bootstrap/native.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index f6c453ebe10..68f917d3528 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -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()); } |