Skip to content

Fix macos builds #13

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

Merged
Eclips4 merged 4 commits into from
Dec 16, 2025
Merged

Fix macos builds #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
688968d
fix build
Eclips4 Dec 15, 2025
8f3946a
Adjust makesetup
Eclips4 Dec 15, 2025
dea8c3d
Check if this helps for android
Eclips4 Dec 15, 2025
640feb0
Remove android workaround & we'll deal with that later
Eclips4 Dec 16, 2025
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
2 changes: 1 addition & 1 deletion Modules/makesetup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
# there's actually only one obj, so just set it to the lib
for lib in $libs
do
objs="target/\$(CARGO_TARGET_DIR)/$lib"
objs="target/\$(if \$(CARGO_TARGET),\$(CARGO_TARGET)/\$(CARGO_TARGET_DIR),\$(CARGO_TARGET_DIR))/$lib"
done
libs=
# depends on the headers through cpython-sys
Expand Down
10 changes: 9 additions & 1 deletion configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4333,6 +4333,15 @@ else
aarch64-apple-ios-simulator)
CARGO_TARGET="aarch64-apple-ios-sim"
;;
*-apple-darwin*)
Copy link

@emmatyping emmatyping Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll probably need to review config.guess and ensure that we cover ~all of the platforms it can generate (at least all of the tiered Python platforms to start with).

cargo_host="$host"
case "$cargo_host" in
arm64-apple-*)
cargo_host="aarch64${cargo_host#arm64}"
;;
esac
CARGO_TARGET="${cargo_host%%-apple-darwin*}-apple-darwin"
;;
*)
CARGO_TARGET="$host"
;;
Expand Down
Loading