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

llvmPackages_5.compiler-rt: fix for glibc bump using upstream fix #80124

Open
wants to merge 1 commit into
base: master
from

Conversation

@dtzWill
Copy link
Contributor

dtzWill commented Feb 14, 2020

Motivation for this change

Unbreak :).

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

This comment has been minimized.

Copy link
Contributor

doronbehar commented Feb 23, 2020

Either this or #80381 should be closed.

@chkno

This comment has been minimized.

Copy link
Member

chkno commented Feb 24, 2020

ZHF: #80379 This would fix https://hydra.nixos.org/build/113047930/nixlog/1

Differences between this and #80381:

  • This can apply both the new patch and sanitizers-nongnu.patch when isMusl is set. Both of these patches remove the troublesome #include <sys/ustat.h> line. #80381 applies only one or the other, because I expected trying to remove it twice would fail.
  • This PR applies the patch only when stdenv.hostPlatform.libc == "glibc". #80381 applies it more broadly -- whenever !isMusl.

I defer to more knowledgeable folks about which is better, or if any of this matters. I'm just trying to get the Hydra build more green.

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

3 participants
You can’t perform that action at this time.