pyrox.dev
GCC 4.6: Fix the Canadian cross.
svn path=/nixpkgs/trunk/; revision=32621
+10
-3
pkgs/top-level/all-packages.nix
+10
-3
pkgs/top-level/all-packages.nix
···
1922
1923
gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
1924
inherit noSysDirs;
1925
-
cross = null;
1926
-
libcCross = null;
1927
-
binutilsCross = null;
1928
1929
ppl = ppl0_11;
1930
cloogppl = null;
···
1932
# bootstrapping a profiled compiler does not work in the sheevaplug:
1933
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
1934
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
1935
}));
1936
1937
# A non-stripped version of GCC.
···
1922
1923
gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
1924
inherit noSysDirs;
1925
1926
ppl = ppl0_11;
1927
cloogppl = null;
···
1929
# bootstrapping a profiled compiler does not work in the sheevaplug:
1930
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
1931
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
1932
+
1933
+
# When building `gcc.hostDrv' (a "Canadian cross", with host == target
1934
+
# and host != build), `cross' must be null but the cross-libc must still
1935
+
# be passed.
1936
+
cross = null;
1937
+
libcCross = if crossSystem != null then libcCross else null;
1938
+
libpthreadCross =
1939
+
if crossSystem != null && crossSystem.config == "i586-pc-gnu"
1940
+
then gnu.libpthreadCross
1941
+
else null;
1942
}));
1943
1944
# A non-stripped version of GCC.