* build kernel with gcc 4.1.1
* let dietlibc use gcc 3.4.6, so e2fsprogs 1.36 can at least compile with it (errors with gcc 4, which are warnings with 3.4 and weird errors with e2fsprogs 1.38 and 1.39) svn path=/nixpkgs/trunk/; revision=5527
This commit is contained in:
parent
d4643c2a7f
commit
280ff96282
@ -570,10 +570,11 @@ rec {
|
|||||||
nativeGlibc = false;
|
nativeGlibc = false;
|
||||||
gcc = (import ../os-specific/linux/dietlibc-wrapper) {
|
gcc = (import ../os-specific/linux/dietlibc-wrapper) {
|
||||||
inherit stdenv dietlibc;
|
inherit stdenv dietlibc;
|
||||||
gcc = stdenv.gcc;
|
#gcc = stdenv.gcc;
|
||||||
|
gcc = gcc34;
|
||||||
};
|
};
|
||||||
#inherit (stdenv.gcc) binutils glibc;
|
#inherit (stdenv.gcc) binutils glibc;
|
||||||
inherit (stdenv.gcc) binutils;
|
inherit (gcc34) binutils;
|
||||||
glibc = dietlibc;
|
glibc = dietlibc;
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
};
|
};
|
||||||
@ -1837,8 +1838,7 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
kernel = (import ../os-specific/linux/kernel) {
|
kernel = (import ../os-specific/linux/kernel) {
|
||||||
inherit fetchurl perl mktemp;
|
inherit fetchurl perl mktemp stdenv;
|
||||||
stdenv = overrideGCC stdenv gcc34;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#klibc = (import ../os-specific/linux/klibc) {
|
#klibc = (import ../os-specific/linux/klibc) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user