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

glibc: Grab the right linux headers when build != host #29625

Merged
merged 1 commit into from Sep 21, 2017

Conversation

Ericson2314
Copy link
Member

Motivation for this change

In #28519 / 791ce59 I made linuxHeaders be used from the stage stage, as it would be if it were a library containing headers and code. I forgot to update glibc, however, so it was incorrectly using headers for the build platform, not host platform.

This fixes that, basically reverting a small portion of changes I made a few months ago in 25edc47 and its parent.

Things done

No native hashes are changed.

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

In NixOS#28519 / 791ce59 I made linux
headers be intended to be used from the stage stage, as it would be if
it were a library containing headers and code. I forgot to update glibc,
however, so it was incorrectly using headers for the build platform, not
host platform.

This fixes that, basically reverting a small portion of changes I made a
few months ago in 25edc47 and its
parent.

No native hashes are changed.
@Ericson2314 Ericson2314 self-assigned this Sep 21, 2017
@Ericson2314
Copy link
Member Author

Ericson2314 commented Sep 21, 2017

@dezgeg This will fix the last set of regressions in https://hydra.nixos.org/jobset/nixpkgs/cross-trunk

@Ericson2314 Ericson2314 merged commit df0c265 into NixOS:master Sep 21, 2017
@Ericson2314 Ericson2314 deleted the linuxHeadersCross branch September 21, 2017 01:13
@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Sep 21, 2017
@Ericson2314 Ericson2314 added this to Needed for binutils-wrapper in Cross compilation Sep 21, 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