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

Jump to bottom

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

Merged
merged 1 commit into from Mar 2, 2020
Merged

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

merged 1 commit into from Mar 2, 2020

Conversation

dtzWill
Copy link
Member

@dtzWill 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
Copy link
Contributor

Either this or #80381 should be closed.

@chkno
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:

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.

@vcunat vcunat self-assigned this Mar 2, 2020
@vcunat
Copy link
Member

vcunat commented Mar 2, 2020

I don't think both can be applied. If both the conditions hold, they're just wrong... one stdenv can't use both libc implementations "at once".

vcunat
vcunat approved these changes Mar 2, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Seems good, fixes the build. I don't have a strong opinion on which of the two PRs take.

@vcunat vcunat merged commit fb6ceb4 into NixOS:master Mar 2, 2020
vcunat added a commit that referenced this pull request Mar 2, 2020
@vcunat
Merge #80124: llvmPackages_5.compiler-rt: fix for glibc bump
41a6baf 
(cherry picked from commit fb6ceb4)
I re-tested the build for 20.03, before and after this commit.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees

@vcunat vcunat

Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtzWill @doronbehar @chkno @vcunat