alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

GCC 4.6: Fix the Canadian cross.

Browse source 
svn path=/nixpkgs/trunk/; revision=32621
This commit is contained in:
Ludovic Courtès 2012-02-27 17:22:30 +00:00
parent 0400423fb1
commit 27916e6f08
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/top-level/all-packages.nix
View file

@ -1922,9 +1922,6 @@ let
gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 { gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
inherit noSysDirs; inherit noSysDirs;
cross = null;
libcCross = null;
binutilsCross = null;
ppl = ppl0_11; ppl = ppl0_11;
cloogppl = null; cloogppl = null;
@ -1932,6 +1929,16 @@ let
# bootstrapping a profiled compiler does not work in the sheevaplug: # bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
# When building `gcc.hostDrv' (a "Canadian cross", with host == target
# and host != build), `cross' must be null but the cross-libc must still
# be passed.
cross = null;
libcCross = if crossSystem != null then libcCross else null;
libpthreadCross =
if crossSystem != null && crossSystem.config == "i586-pc-gnu"
then gnu.libpthreadCross
else null;
})); }));
# A non-stripped version of GCC. # A non-stripped version of GCC.