diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-26 13:26:44 -0500 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-01-26 23:29:06 +0200 |
| commit | 71f814a88965dd940c5c7c7658b83ace0971d0a9 (patch) | |
| tree | da836ff434dd81174b9acad923611a3f371db00c /pkgs/development/libraries/glibc | |
| parent | 314fb3d60aa6bc045b1d2b928f721dba1983ccc5 (diff) | |
| download | nixlib-71f814a88965dd940c5c7c7658b83ace0971d0a9.tar nixlib-71f814a88965dd940c5c7c7658b83ace0971d0a9.tar.gz nixlib-71f814a88965dd940c5c7c7658b83ace0971d0a9.tar.bz2 nixlib-71f814a88965dd940c5c7c7658b83ace0971d0a9.tar.lz nixlib-71f814a88965dd940c5c7c7658b83ace0971d0a9.tar.xz nixlib-71f814a88965dd940c5c7c7658b83ace0971d0a9.tar.zst nixlib-71f814a88965dd940c5c7c7658b83ace0971d0a9.zip | |
lib, glibc: Get rid of withTLS
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. [1]: https://sourceware.org/git/?p=glibc.git;a=commit;h=83cd14204559abbb52635006832eaf4d2f42514a
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index f68970ae13e2..bd116ff6f306 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -127,7 +127,6 @@ stdenv.mkDerivation ({ ] ++ lib.optionals withLinuxHeaders [ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (cross != null) [ - (if cross.withTLS then "--with-tls" else "--without-tls") (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" @@ -190,8 +189,6 @@ stdenv.mkDerivation ({ libc_cv_forced_unwind=yes 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"} EOF export BUILD_CC=gcc |