diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-09 12:01:39 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-09 12:01:39 +0100 |
commit | 637e799eada0ee8922e532d22f824b708b1eaddb (patch) | |
tree | 0bf30b4551008d0ed81b740814f80ab56e6f05c5 /pkgs/stdenv/linux | |
parent | 5e434ef318579e7f33856cf3515210153ebeb881 (diff) | |
parent | 755dac3c6d50ad43abf22503a327a876db26ed81 (diff) | |
download | nixlib-637e799eada0ee8922e532d22f824b708b1eaddb.tar nixlib-637e799eada0ee8922e532d22f824b708b1eaddb.tar.gz nixlib-637e799eada0ee8922e532d22f824b708b1eaddb.tar.bz2 nixlib-637e799eada0ee8922e532d22f824b708b1eaddb.tar.lz nixlib-637e799eada0ee8922e532d22f824b708b1eaddb.tar.xz nixlib-637e799eada0ee8922e532d22f824b708b1eaddb.tar.zst nixlib-637e799eada0ee8922e532d22f824b708b1eaddb.zip |
Merge stdenv-updates-gcc47 into stdenv-updates
Conflicts (simple): pkgs/development/libraries/gmp/5.0.5.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 84af23a263cd..3e71ac467398 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -17,7 +17,7 @@ rec { else if system == "powerpc-linux" then import ./bootstrap/powerpc else if system == "armv5tel-linux" then import ./bootstrap/armv5tel else if system == "armv6l-linux" then import ./bootstrap/armv6l - else if system == "armv7l-linux" then import ./bootstrap/armv5tel + else if system == "armv7l-linux" then import ./bootstrap/armv6l else if system == "mips64el-linux" then import ./bootstrap/loongson2f else abort "unsupported platform for the pure Linux stdenv"; @@ -58,7 +58,8 @@ rec { builder = bootstrapFiles.sh; args = - if (system == "armv5tel-linux" || system == "armv6l-linux") + if system == "armv5tel-linux" || system == "armv6l-linux" + || system == "armv7l-linux" then [ ./scripts/unpack-bootstrap-tools-arm.sh ] else [ ./scripts/unpack-bootstrap-tools.sh ]; @@ -215,6 +216,9 @@ rec { cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; }; + extraAttrs = { + glibc = stdenvLinuxGlibc; # Required by gcc47 build + }; inherit fetchurl; }; |