diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2012-04-15 23:41:25 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2012-04-15 23:41:25 +0000 |
| commit | 82b308bf110ed9d246922bc8f742837323585a24 (patch) | |
| tree | 113de21f14312edbbaab15445b870cc8a2140180 /pkgs/development/libraries/glibc | |
| parent | 6a9ac1f01699a28c2d16ee082ff744291675df92 (diff) | |
| download | nixlib-82b308bf110ed9d246922bc8f742837323585a24.tar nixlib-82b308bf110ed9d246922bc8f742837323585a24.tar.gz nixlib-82b308bf110ed9d246922bc8f742837323585a24.tar.bz2 nixlib-82b308bf110ed9d246922bc8f742837323585a24.tar.lz nixlib-82b308bf110ed9d246922bc8f742837323585a24.tar.xz nixlib-82b308bf110ed9d246922bc8f742837323585a24.tar.zst nixlib-82b308bf110ed9d246922bc8f742837323585a24.zip | |
Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
Diffstat (limited to 'pkgs/development/libraries/glibc')
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 6cb663d7f127..840c60545524 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ (if cross.float == "soft" then "--without-fp" else "--with-fp") "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ + ] ++ stdenv.lib.optionals stdenv.isArm [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix index 4ded6e4edd8b..8edbbd1125a4 100644 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ b/pkgs/development/libraries/glibc/2.14/common.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ (if cross.float == "soft" then "--without-fp" else "--with-fp") "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ + ] ++ stdenv.lib.optionals stdenv.isArm [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/default.nix b/pkgs/development/libraries/glibc/2.9/default.nix index b778743147e6..7d42825206e2 100644 --- a/pkgs/development/libraries/glibc/2.9/default.nix +++ b/pkgs/development/libraries/glibc/2.9/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "--enable-kernel=2.6.0" "--without-fp" "--with-__thread" - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/headers.nix b/pkgs/development/libraries/glibc/2.9/headers.nix index adb9a22f4810..7adeb11c8bc1 100644 --- a/pkgs/development/libraries/glibc/2.9/headers.nix +++ b/pkgs/development/libraries/glibc/2.9/headers.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--disable-sanity-checks" "--enable-hacker-mode" (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/locales.nix b/pkgs/development/libraries/glibc/2.9/locales.nix index c7b1bb2bff0a..a1fe9f82f143 100644 --- a/pkgs/development/libraries/glibc/2.9/locales.nix +++ b/pkgs/development/libraries/glibc/2.9/locales.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--enable-add-ons" "--without-headers" "--disable-profile" - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" |