public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge stdenv-updates-gcc47 into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/development/libraries/gmp/5.0.5.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2013-03-09 12:01:39 +01:00
parent 5e434ef318 755dac3c6d
commit 637e799ead
6 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/linux/default.nix
View File

@@ -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;
};