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

Cross-compiling fixes for builders #12

Merged
merged 3 commits into from
Dec 10, 2018
Merged

Cross-compiling fixes for builders #12

merged 3 commits into from
Dec 10, 2018

Conversation

angerman
Copy link

Motivation for this change
Things done
  • 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.

@angerman
[ghc] If we enable integer-gmp, pass information unconditionally
495ef55 
The check for `targetPlatform == hostPlatform` is simply wrong.  If
we build a cross compiler, and *do* enable integer-gmp, we must
pass the `--with-gmp-*` values, otherwise the integer-gmp libraries
package file (the one ghc-pkg / ghc / cabal consult) will miss the
proper paths to the gmp library!
@angerman
[trivial-builder] Add copyJoin for platforms non-symlink-platforms
dfdf1a8 
There is no `lndir` for windows, and even linking them on a different
platform makes little sense for windows.
@angerman
Add doCrossCheck override
7abdf1b
@angerman angerman requested review from disassembler, rvl and a team December 10, 2018 07:32
@angerman angerman self-assigned this Dec 10, 2018
@angerman
Copy link
Author

Let's do this! Review pls :-)

rvl
rvl approved these changes Dec 10, 2018
View reviewed changes
Copy link

@rvl rvl 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 - has the fixes you explained to me before.
I wonder about rsync -- it would work but is that the normal way to join together store paths?

@rvl rvl changed the title Iohk 18.09 angerman Cross-compiling fixes for builders Dec 10, 2018
@angerman
Copy link
Author

@rvl, the rsync part is the only reliable way I could get the folders to merge.

@angerman angerman merged commit 3ff97c1 into iohk-18.09 Dec 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rvl rvl rvl approved these changes

@disassembler disassembler Awaiting requested review from disassembler

Assignees

@angerman angerman

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@angerman @rvl