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

lib platform parsing: Fix windows support to conform to LLVM #25275

Merged
merged 4 commits into from Apr 27, 2017

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Apr 27, 2017

Motivation for this change

This gives us a decent story on mingw and cygwin.

CC @taktoa

Things done

http://hydra.nixos.org/eval/1353847


@mention-bot
Copy link

@Ericson2314, thanks for your PR! By analyzing the history of the files in this pull request, we identified @nbp, @edolstra and @rbvermaa to be potential reviewers.

@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Apr 27, 2017
@Ericson2314 Ericson2314 force-pushed the platform-normalize branch 2 times, most recently from c15ecf7 to 475b65c Compare April 27, 2017 18:26
There is no more `cygwin` OS, but instead a `cygnus` abi. "win32"
and "mingw32" parse as `windows`. Add a 3-part hack because autotools
breaks on explicit abi with windows-like (e.g. "i686-pc-windows-gnu").

Also change cross triples to conform
Actually the old check wasn't being hit because a slightly different
target triple was being used.
@Ericson2314
Copy link
Member Author

No regressions, and fairly boring PR, so merging.

@Ericson2314 Ericson2314 merged commit 2282a57 into NixOS:master Apr 27, 2017
@Ericson2314 Ericson2314 deleted the platform-normalize branch April 27, 2017 20:27
@domenkozar
Copy link
Member

This broke tests: http://hydra.nixos.org/build/52055698

@Ericson2314
Copy link
Member Author

Oof sorry I thought I tested everything! Unfortunately I'm now on vacation sans laptop too. That test means the definition of lib.systems.doubles.all changed. If you post it vs the hardcoded value it was before (in lib/tests/systems.nix or so), I'll try to diagnose.

vcunat added a commit that referenced this pull request May 6, 2017
This reverts commit 2282a57, reversing
changes made to 14adea9.

The lib tests are bloking nixpkgs-unstable, and I don't like debugging
it soon enough.
Ericson2314 added a commit to Ericson2314/nixpkgs that referenced this pull request May 17, 2017
Second attempt at pull request NixOS#25275

This reverts commit b70924b,
reapplying 2282a57
@Ericson2314 Ericson2314 added this to Prior in Cross compilation Oct 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants