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

Fix misuses of overrideCC #63698

Merged
merged 3 commits into from Jun 23, 2019
Merged

Fix misuses of overrideCC #63698

merged 3 commits into from Jun 23, 2019

Conversation

tobim
Copy link
Contributor

@tobim tobim commented Jun 23, 2019

Motivation for this change

As stated in #63293 (comment) overrideCC has to be called with a compiler from buildPackages, otherwise it breaks cross builds.

Things done
  • Replace uses of overrideCC with indirections to gccXStdenv.

Note that I did very limited testing on this. I tried to build apt for raspberryPi but that fails at some perl library dependency.

  • 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 nix-review --run "nix-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.

@tobim
dpkg: fix cross compilation
79d72cc
@tobim
Fix overrideCC invokations for cross builds
3a7bb25 
`overrideCC` should always take a compiler for the build
system, otherwise cross compilation is not possible.
@tobim
Use of gccXStdenv instead of inplace overrideCC
6389a0a
Ericson2314
Ericson2314 approved these changes Jun 23, 2019
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beautiful! Thanks!!

@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Jun 23, 2019
@Ericson2314 Ericson2314 merged commit 852d81d into NixOS:master Jun 23, 2019
@tobim tobim deleted the overrideCC-buildPackages branch June 23, 2019 22:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tobim @Ericson2314