Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert default archs on ARM64 change

Browse Source
This commit is contained in:
Steve Dower
2022-10-04 16:36:44 +01:00
parent ae58080d01
commit aa79b6eda9
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/architecture.py
+1 -5
View File
@@ -93,11 +93,7 @@ class Architecture(Enum):
# x86_64 machines can run i686 containers # x86_64 machines can run i686 containers
result.add(Architecture.i686) result.add(Architecture.i686)
if platform == "windows": if platform == "windows" and Architecture.AMD64 in result:
if Architecture.ARM64 in result:
result.add(Architecture.AMD64)
result.add(Architecture.x86)
elif Architecture.AMD64 in result:
result.add(Architecture.x86) result.add(Architecture.x86)
return result return result
docs/options.md
+1 -1
View File
@@ -369,7 +369,7 @@ Default: `auto`
|---|---|---|---|---| |---|---|---|---|---|
| Linux / Intel | `x86_64` | `x86_64` `i686` | `x86_64` | `i686` | | Linux / Intel | `x86_64` | `x86_64` `i686` | `x86_64` | `i686` |
| Windows / Intel | `AMD64` | `AMD64` `x86` | `AMD64` | `x86` | | 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 / Intel | `x86_64` | `x86_64` | `x86_64` | |
| macOS / Apple Silicon | `arm64` | `arm64` | `arm64` | | | macOS / Apple Silicon | `arm64` | `arm64` | `arm64` | |