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

cc-wrapper: Two trivial changes affecting cross compilation #29548

Merged
merged 2 commits into from Sep 18, 2017

Conversation

Ericson2314
Copy link
Member

Motivation for this change
  1. Remove obsolete assert with unbound identifier. It served no purpose other than to break cross evals.

  2. Fix dynamic loader for non-x86_64 Darwin. [Though plenty of other things prevent pure cross-compilation for that.]

Things done

No hashes should be changed.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

This was just causing evaluation problems on cross.
In practice, this is correct because iOS is on ARM and puts the loader
there.
@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Sep 18, 2017
@Ericson2314 Ericson2314 merged commit 6338c0b into NixOS:master Sep 18, 2017
@Ericson2314 Ericson2314 deleted the cc-wrapper-cross-misc branch September 18, 2017 23:34
@Ericson2314 Ericson2314 added this to Needed for binutils-wrapper in Cross compilation Sep 20, 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
Cross compilation
Needed for binutils-wrapper
Development

Successfully merging this pull request may close these issues.

None yet

1 participant