Skip to content

Cross-compile to intel mac from ARM mac#229

Merged
CGMossa merged 4 commits intomasterfrom
update_bindings
Apr 23, 2024
Merged

Cross-compile to intel mac from ARM mac#229
CGMossa merged 4 commits intomasterfrom
update_bindings

Conversation

@CGMossa
Copy link
Member

@CGMossa CGMossa commented Apr 23, 2024

Github's default macos-image has changed to ARM-based on. Therefore, we now have to cross-compile from ARM mac to intel mac.

Also, I believe the bindings are out of date, due to messy git rebasing done by me.

Note: This was a guided by @yutannihilation!

Long explanation

I have been resolving conflicts in the opposite direction when doing git rebase. The term current, when rebasing,
refers to the main/master-branch, and not one's PR branch. Or maybe, I'm just mistaken how it should work. Regardless, I believe after a rebase, I should make a [generate bindings] commit, to truly ensure, that the bindings are correctly generated.

@CGMossa CGMossa changed the title Update bindings Cross-compile to intel mac from ARM mac Apr 23, 2024
@CGMossa CGMossa requested a review from Ilia-Kosenkov April 23, 2024 13:41
Copy link
Member

@Ilia-Kosenkov Ilia-Kosenkov left a comment

Choose a reason for hiding this comment

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

Since x86_64 diffs match, I believe it is safe. But let's monitor!

@CGMossa CGMossa merged commit cf0f652 into master Apr 23, 2024
@CGMossa CGMossa deleted the update_bindings branch April 23, 2024 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants