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.

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

Apple Silicon macOS support #7389

Merged
merged 1 commit into from
Feb 16, 2021
Merged

Apple Silicon macOS support #7389

merged 1 commit into from
Feb 16, 2021

Conversation

randall
Copy link
Contributor

@randall randall commented Dec 15, 2020

Allows builds on Apple Silicon to complete and run

@randall randall added the Build label Dec 15, 2020
@randall randall added this to the 10.0.0 milestone Dec 15, 2020
@randall randall added this to In progress in 9.1.x Branch and Release via automation Dec 15, 2020
@randall randall force-pushed the macos_darwin branch 2 times, most recently from 41d650b to c81bb76 Compare December 30, 2020 00:21
@randall randall changed the title Disable compiling Inline.cc on macOS Apple Silicon macOS support Dec 30, 2020
@randall randall self-assigned this Jan 6, 2021
@ywkaras
Copy link
Contributor

ywkaras commented Jan 9, 2021

I am confused that there are changes to catch.hpp but no change to the version, how is that possible?

3 similar comments
@ywkaras

This comment has been minimized.

@ywkaras

This comment has been minimized.

@ywkaras
Copy link
Contributor

ywkaras commented Jan 9, 2021

I am confused that there are changes to catch.hpp but no change to the version, how is that possible?

@randall
Copy link
Contributor Author

randall commented Feb 1, 2021

I am confused that there are changes to catch.hpp but no change to the version, how is that possible?

I manually back ported the apple-related changes from catch.

Upgrading catch to it's latest version is an effort of it's own: #7464

@bryancall
Copy link
Contributor

@randall Can you have a better explanation of what is happening? We did a code review today and had questions.

Allows builds on Apple Silicon to complete and run
@randall
Copy link
Contributor Author

randall commented Feb 12, 2021

originally, I back ported some macOS specific changes from catch.hpp's head to get macOS on AS to build. With #7464 merged I no longer need that (and this PR has been fixed up to reflect that)

@apache apache deleted a comment from bneradt Feb 16, 2021
9.1.x Branch and Release automation moved this from In progress to Ready to Merge Feb 16, 2021
@randall randall merged commit fa8b3f9 into apache:master Feb 16, 2021
9.1.x Branch and Release automation moved this from Ready to Merge to Done Feb 16, 2021
@randall randall deleted the macos_darwin branch February 16, 2021 20:28
@zwoop
Copy link
Contributor

zwoop commented Feb 23, 2021

Cherry-picked to v9.1.x branch.

@zwoop zwoop removed this from Done in 9.1.x Branch and Release Feb 23, 2021
@zwoop zwoop added this to the 9.1.0 milestone Feb 23, 2021
@zwoop
Copy link
Contributor

zwoop commented Feb 23, 2021

Cherry-picked to v9.0.x branch.

@zwoop zwoop modified the milestones: 9.1.0, 9.0.1 Feb 23, 2021
@zwoop
Copy link
Contributor

zwoop commented Mar 9, 2021

I think we need to revert this for now, from all release branches.

@zwoop zwoop modified the milestones: 9.0.1, 10.0.0 Mar 9, 2021
@randall randall added this to In progress in 9.1.x Branch and Release via automation May 5, 2021
@zwoop zwoop moved this from In progress to Done in 9.1.x Branch and Release May 17, 2021
@zwoop zwoop removed this from Done in 9.1.x Branch and Release May 26, 2021
@zwoop zwoop modified the milestones: 10.0.0, 9.1.0 May 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants