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 | |
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
-rw-r--r-- | lib/systems/examples.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 90d7e956d2ba..8d7d2440e889 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -14,7 +14,6 @@ rec { bigEndian = false; arch = "armv5tel"; float = "soft"; - withTLS = true; libc = "glibc"; platform = platforms.sheevaplug; openssl.system = "linux-generic32"; @@ -26,7 +25,6 @@ rec { arch = "armv6l"; float = "hard"; fpu = "vfp"; - withTLS = true; libc = "glibc"; platform = platforms.raspberrypi; openssl.system = "linux-generic32"; @@ -38,7 +36,6 @@ rec { arch = "armv7-a"; float = "hard"; fpu = "vfpv3-d16"; - withTLS = true; libc = "glibc"; platform = platforms.armv7l-hf-multiplatform; openssl.system = "linux-generic32"; @@ -48,7 +45,6 @@ rec { config = "aarch64-unknown-linux-gnu"; bigEndian = false; arch = "aarch64"; - withTLS = true; libc = "glibc"; platform = platforms.aarch64-multiplatform; }; @@ -67,7 +63,6 @@ rec { libc = "glibc"; - withTLS = true; openssl.system = "linux-generic32"; }; @@ -76,7 +71,6 @@ rec { bigEndian = false; arch = "mips"; float = "hard"; - withTLS = true; libc = "glibc"; platform = platforms.fuloong2f_n32; openssl.system = "linux-generic32"; 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e362c743b1a3..dddadcf2b7eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5366,7 +5366,6 @@ with pkgs; bigEndian = true; arch = "mips"; float = "soft"; - withTLS = true; libc = "uclibc"; platform = { name = "ben_nanonote"; |