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

Fix include path of libffi used in GHC build #56573

Merged
merged 1 commit into from Mar 1, 2019

Conversation

sgraf812
Copy link
Contributor

@sgraf812 sgraf812 commented Mar 1, 2019

Motivation for this change

See a7c7743. $libffi/include doesn't exist, so code depending on GHC's libffi is broken.

Things done

See the diff. I verified that it works as intended.

  • Check that this builds GHC
  • Check that the resulting GHC can be used to bootstrap GHC (as opposed to before)
  • 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

sgraf812 referenced this pull request Mar 1, 2019
Use the system `libffi` (`ie` nixpkgs's) instead of built-in libffi
from ghc source tree.

This will prevent library conflict when ghc dynamically links haskell
packages (linked with ghc built-in libffi) and any external library
which uses nixpkgs `libffi`.

Closes #55208.
@peti peti merged commit 9f08796 into NixOS:master Mar 1, 2019
@sgraf812
Copy link
Contributor Author

sgraf812 commented Mar 1, 2019

Forgive my ignorance, but will this also be merged into 18.09?

@peti
Copy link
Member

peti commented Mar 1, 2019

No. I could merge it manually, but I don't think it's necessary since the original patch that you were fixing here has never been merged into the release branch either.

@sgraf812
Copy link
Contributor Author

sgraf812 commented Mar 1, 2019

I just realised I was on nixpkgs-unstable the whole time. Anyway, thanks!

@sgraf812 sgraf812 deleted the fix-ghc-system-libffi branch March 1, 2019 13:01
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

4 participants