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

Merge remote-tracking branch 'eelco/master' into stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
This commit is contained in:
Lluís Batlle i Rossell
2012-12-28 23:28:16 +01:00
parent 88b11196c1 fde74242bf
commit b58780c43d
135 changed files with 1945 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/4.7/default.nix
+3
View File
@@ -89,9 +89,11 @@ let version = "4.7.2";
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
gccMode = stdenv.lib.attrByPath [ "gcc" "mode" ] null cross;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
crossMingw = (cross != null && cross.libc == "msvcrt");
crossConfigureFlags =
@@ -99,6 +101,7 @@ let version = "4.7.2";
withArch +
withCpu +
withAbi +
withMode +
(if crossMingw && crossStageStatic then
" --with-headers=${libcCross}/include" +
" --with-gcc" +