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

ghcHEAD: minor fixes for musl, cross #42585

Merged
merged 3 commits into from Jun 25, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jun 25, 2018

Same as those recently applied to 8.4.3
(#42455, #42581)

  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

Builds cross-x86_64-linux-musl, "hello" package.

@dtzWill dtzWill requested a review from peti as a code owner June 25, 2018 20:54
@dtzWill
Copy link
Member Author

dtzWill commented Jun 25, 2018

GHC makes a 32-core builder look like a raspberryPi building LLVM. 😛

I'm also building without the useLLVM change (last one) just to be sure it's indeed needed as it is with the others, although I fully expect it will be.


EDIT: yep build w/o useLLVM fix failed, woohoo that didn't take too long :).

@dtzWill
Copy link
Member Author

dtzWill commented Jun 25, 2018

LGTM! ^_^

@dtzWill
Copy link
Member Author

dtzWill commented Jun 25, 2018

Since no (non-cross) rebuilds, and same changes were good on other versions, going ahead and merging.

If there are any problems/doubts LMK and we'll sort them out (and revert if that doesn't happen quickly).

@dtzWill dtzWill merged commit b216885 into NixOS:master Jun 25, 2018
@dtzWill dtzWill deleted the fix/ghcHEAD-musl-cross branch June 25, 2018 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants