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

rust: fix glibc build #34205

Merged
merged 1 commit into from Jan 25, 2018
Merged

rust: fix glibc build #34205

merged 1 commit into from Jan 25, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Jan 23, 2018

Motivation for this change

Tested rustc, cargo and a few rust packages.

/cc @vcunat

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@erictapen
Copy link
Member

There currently are two more approaches to fix rustc breakage, discussed in #34189;

  • Patching glibc
  • Adjusting the rustc test in question to expect the result happening.

@@ -101,6 +101,10 @@ stdenv.mkDerivation {
# Useful debugging parameter
# export VERBOSE=1
''
+ optionalString (stdenv ? glibc) ''
# Disable test for glibc-2.26
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick: it's patched glibc-2.25.

@vcunat
Copy link
Member

vcunat commented Jan 24, 2018

I think disabling the whole test as in this PR is the best way, at least for now.

@LnL7
Copy link
Member Author

LnL7 commented Jan 24, 2018

Yeah, unless it really is a glibc bug ofcorse but doesn't look like that's the case.

@erictapen
Copy link
Member

One thing that irritates me is that the test remains unchanged in newest rustc version. How can that compile? Anyway, I think disabling the test is absolutely sufficient for release-17.09.

@vcunat vcunat merged commit 563e39f into NixOS:release-17.09 Jan 25, 2018
vcunat added a commit that referenced this pull request Jan 25, 2018
... after applying glibc patches.
It's not clear (yet) why this older rustc (test) got broken.
Newer rustc (used for Firefox) has the very same test that still passes.
@vcunat
Copy link
Member

vcunat commented Jan 25, 2018

Strange, but I see no use in delaying any more. We can improve later, when/if we find out more.

@erictapen
Copy link
Member

Oh of course! I'm happy there is a solution to the issue in. Thanks for merging.

@LnL7 LnL7 deleted the rust-glibc branch January 28, 2018 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants