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

binutils: enable gold when cross compiling on darwin #109422

Merged
merged 1 commit into from Jan 21, 2021

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Jan 15, 2021

This basically reverts:

  • 3c5188c ('binutils: disable gold when building on darwin')
  • 457b48c ('binutils: apply patch when cross compiling from darwin')

Tested by building:

  • nix build -f . pkgsCross.i686-embedded.buildPackages.binutils
  • nix build -f . pkgsCross.aarch64-embedded.buildPackages.binutils
Motivation for this change

Cross compile haskell

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @matthewbauer

This basically reverts:
 - 3c5188c ('binutils: disable gold when building on darwin')
 - 457b48c ('binutils: apply patch when cross compiling from darwin')

Tested by building:
 - nix build -f . pkgsCross.i686-embedded.buildPackages.binutils
 - nix build -f . pkgsCross.aarch64-embedded.buildPackages.binutils
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 15, 2021
@veprbl veprbl added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Jan 15, 2021
@veprbl veprbl merged commit 55e8a35 into NixOS:master Jan 21, 2021
@matthewbauer
Copy link
Member

Looks good - thanks!

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 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants