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

lib: Split Darwin into macOS and iOS #37359

Merged
merged 1 commit into from Mar 19, 2018
Merged

lib: Split Darwin into macOS and iOS #37359

merged 1 commit into from Mar 19, 2018

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Mar 19, 2018 •
edited

Motivation for this change

I noticed LLVM accepts ios as its own OS in platform triples; a recent change as far as I know. I see it also accepts macos* for macOS (formerly OS X). If it's now customary to distinguish iOS like so (rather than guessing from the aarch, lets add both so our OSes are still disjoint, and make Darwin a family instead.

But changing the config everywhere would probably be a mass rebuild, and I'm not sure how well other software supports OSes besides "darwin", so I'm keeping that the default name for macOS for now.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

CC @kmicklas @angerman @nixos/darwin-maintainers

@Ericson2314 Ericson2314 requested a review from nbp as a code owner March 19, 2018 04:43
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Mar 19, 2018
@Ericson2314 Ericson2314 mentioned this pull request Mar 19, 2018
Closed
4 tasks
@angerman
Copy link
Contributor

Just a side note: the kernel would actually be xnu though...

@Ericson2314
lib: Split Darwin into macOS and iOS
bbfa2f9 
I noticed LLVM accepts `ios` as its own OS in platform triples; a
recent change as far as I know. I see it also accepts `macos*` for macOS
(formerly OS X). If it's now customary to distinguish iOS like so
(rather than guessing from the aarch, lets add both so our OSes are
still disjoint, and make Darwin a family instead.

But changing the config everywhere would probably be a mass rebuild, and
I'm not sure how well other software supports OSes besides "darwin", so
I'm keeping that the default name for macOS for now.
@Ericson2314 Ericson2314 added the 6.topic: portability General portability concerns, not specific to cross-compilation or a specific platform label Mar 19, 2018
LnL7
LnL7 approved these changes Mar 19, 2018
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Looks good to me, but I'm not that familiar with the system/platforms internals.

@Ericson2314 Ericson2314 merged commit c22e2f8 into NixOS:master Mar 19, 2018
@Ericson2314 Ericson2314 deleted the lib-darwin-reorg branch March 19, 2018 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: portability General portability concerns, not specific to cross-compilation or a specific platform 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ericson2314 @angerman @LnL7 @GrahamcOfBorg