From aa79b6eda9d227024a837adf01d5c203022d9f16 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 4 Oct 2022 16:36:44 +0100 Subject: [PATCH] Revert default archs on ARM64 change --- cibuildwheel/architecture.py | 8 ++------ docs/options.md | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cibuildwheel/architecture.py b/cibuildwheel/architecture.py index 82822b13..a922f6f5 100644 --- a/cibuildwheel/architecture.py +++ b/cibuildwheel/architecture.py @@ -93,12 +93,8 @@ class Architecture(Enum): # x86_64 machines can run i686 containers result.add(Architecture.i686) - if platform == "windows": - if Architecture.ARM64 in result: - result.add(Architecture.AMD64) - result.add(Architecture.x86) - elif Architecture.AMD64 in result: - result.add(Architecture.x86) + if platform == "windows" and Architecture.AMD64 in result: + result.add(Architecture.x86) return result diff --git a/docs/options.md b/docs/options.md index 58d9587c..55352159 100644 --- a/docs/options.md +++ b/docs/options.md @@ -369,7 +369,7 @@ Default: `auto` |---|---|---|---|---| | Linux / Intel | `x86_64` | `x86_64` `i686` | `x86_64` | `i686` | | Windows / Intel | `AMD64` | `AMD64` `x86` | `AMD64` | `x86` | -| Windows / ARM64 | `ARM64` | `ARM64` `AMD64` `x86` | `ARM64` `AMD64` | `x86` | +| Windows / ARM64 | `ARM64` | `ARM64` | `ARM64` | | | macOS / Intel | `x86_64` | `x86_64` | `x86_64` | | | macOS / Apple Silicon | `arm64` | `arm64` | `arm64` | |