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

lib, glibc: Get rid of withTLS #34303

Merged
merged 1 commit into from Jan 26, 2018
Merged

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Jan 26, 2018

glibc removed the underlying flag in 2011 in 83cd14204559abbb52635006832eaf4d2f42514a 1.

This gets us one step closer to fixing #34274: the cross stdenv for aarch64-unknown-linux-gnu at least evals now.

Thanks to @dezgeg for doing all the research for this.

Motivation for this change
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
    • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Jan 26, 2018
@Ericson2314 Ericson2314 requested a review from nbp as a code owner January 26, 2018 19:07
@@ -191,7 +190,7 @@ stdenv.mkDerivation ({
libc_cv_c_cleanup=yes
libc_cv_gnu89_inline=yes
# Only due to a problem in gcc configure scripts:
libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"}
libc_cv_sparc64_tls=yes
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is unused now as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh figured as much and was going to try to make this not a cross mass rebuild, but it is already. Good catch.

glibc removed the underlying flag in 2011 in
83cd14204559abbb52635006832eaf4d2f42514a [1].

This gets us one step closer to fixing NixOS#34274: the cross stdenv for
aarch64-unknown-linux-gnu at least evals now.

Thanks to @dezgeg for doing all the research for this.

[1]: https://sourceware.org/git/?p=glibc.git;a=commit;h=83cd14204559abbb52635006832eaf4d2f42514a
@dezgeg dezgeg merged commit 71f814a into NixOS:master Jan 26, 2018
@Ericson2314 Ericson2314 deleted the glibc-always-tls branch January 26, 2018 22:28
@Ericson2314 Ericson2314 added this to After big PR in Cross compilation Feb 13, 2018
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 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
No open projects
Cross compilation
After big PR
Development

Successfully merging this pull request may close these issues.

None yet

3 participants