Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: correct the names if a higher MACOS dep target set #819

Closed
wants to merge 2 commits into from
Closed

fix: correct the names if a higher MACOS dep target set #819

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
831c68b
fix: correct the names if a higher MACOS dep target set
henryiii Sep 8, 2021
a6d3089
fix: always use two digits, 11+ has 0
henryiii Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions cibuildwheel/macos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from pathlib import Path
from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple, cast

from packaging.version import Version

from .architecture import Architecture
from .environment import ParsedEnvironment
from .logger import log
Expand Down Expand Up @@ -176,6 +178,20 @@ def install_pypy(version: str, url: str) -> Path:
return installation_bin_path


def macos_max(*versions: str) -> str:
"""
Return the current target, or the system minimum, whichever is higher.
Forces 11+ to always return 0 for the final digit, due to macOS
changes.
"""

best_version = max(Version(s) for s in versions)
if best_version.major >= 11:
best_version = Version(f"{best_version.major}.0")

return f"{best_version.major}.{best_version.minor}"


def setup_python(
python_configuration: PythonConfiguration,
dependency_constraint_flags: Sequence[PathOrStr],
Expand Down Expand Up @@ -270,6 +286,7 @@ def setup_python(
# Set MACOSX_DEPLOYMENT_TARGET to 10.9, if the user didn't set it.
# PyPy defaults to 10.7, causing inconsistencies if it's left unset.
env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9")
mayeut marked this conversation as resolved.
Show resolved Hide resolved
dep_target = env["MACOSX_DEPLOYMENT_TARGET"]

config_is_arm64 = python_configuration.identifier.endswith("arm64")
config_is_universal2 = python_configuration.identifier.endswith("universal2")
Expand All @@ -278,15 +295,19 @@ def setup_python(
if config_is_arm64:
# macOS 11 is the first OS with arm64 support, so the wheels
# have that as a minimum.
env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-11.0-arm64")
env.setdefault("_PYTHON_HOST_PLATFORM", f"macosx-{macos_max(dep_target, '11.0')}-arm64")
env.setdefault("ARCHFLAGS", "-arch arm64")
elif config_is_universal2:
env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-universal2")
env.setdefault(
"_PYTHON_HOST_PLATFORM", f"macosx-{macos_max(dep_target, '10.9')}-universal2"
)
env.setdefault("ARCHFLAGS", "-arch arm64 -arch x86_64")
elif python_configuration.identifier.endswith("x86_64"):
# even on the macos11.0 Python installer, on the x86_64 side it's
# compatible back to 10.9.
env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-x86_64")
env.setdefault(
"_PYTHON_HOST_PLATFORM", f"macosx-{macos_max(dep_target, '10.9')}-x86_64"
)
env.setdefault("ARCHFLAGS", "-arch x86_64")

building_arm64 = config_is_arm64 or config_is_universal2
Expand Down