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: disable gold when building on darwin #61301

Merged
merged 1 commit into from May 11, 2019

Conversation

@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented May 11, 2019

Needed to build anything, otherwise get this error:

https://hydra.nixos.org/build/93192355/

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 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.

@matthewbauer matthewbauer requested a review from Ericson2314 May 11, 2019
@matthewbauer matthewbauer merged commit 8318ded into NixOS:master May 11, 2019
16 checks passed
@@ -61,14 +63,7 @@ stdenv.mkDerivation rec {
./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch
++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.targetPlatform != stdenv.hostPlatform) [
Copy link
Member

@peti peti Aug 6, 2019

Why did you drop this patch?

Copy link
Member Author

@matthewbauer matthewbauer Aug 7, 2019

I don't think it still applied cleanly, but it should be safe to readd if needed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants