Skip to content

cmake: Fix references to OSX / OS X. NFC #18902

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

Merged
merged 1 commit into from
Jan 21, 2024

Conversation

waywardmonkeys
Copy link
Contributor

Use macOS instead.

Copy link
Collaborator

@sbc100 sbc100 left a comment

Choose a reason for hiding this comment

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

lgtm % comment

@@ -30,7 +30,7 @@
# the macro undefined if the type does not exist.
#
# The variable "${VARIABLE}" may be "0" when CMAKE_OSX_ARCHITECTURES has
# multiple architectures for building OS X universal binaries. This
Copy link
Collaborator

Choose a reason for hiding this comment

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

Because this file is essentially copied from upstream cmake I think its best to leave it unpatched if thats OK? It makes copariing with and updating from upstream easier if we minimize changes.

@sbc100
Copy link
Collaborator

sbc100 commented Apr 13, 2023

Do you have time to update and land this?

@waywardmonkeys
Copy link
Contributor Author

@sbc100 Sorry about the 10 month delay ... but I've updated this per your comments.

@sbc100 sbc100 merged commit 0df6362 into emscripten-core:main Jan 21, 2024
@waywardmonkeys waywardmonkeys deleted the cmake-osx-references branch January 22, 2024 04:01
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