GCC 4.7: Make sure `stdenv.glibc' exists before using it.
svn path=/nixpkgs/trunk/; revision=32995
This commit is contained in:
parent
2b2eb19973
commit
0752b1e3d7
1 changed files with 2 additions and 3 deletions
|
@ -1934,7 +1934,6 @@ let
|
|||
binutilsCross = null;
|
||||
}));
|
||||
|
||||
/* needs to be fixed:
|
||||
gcc47 = lowPrio (wrapGCC (lib.overrideDerivation gcc46_debug.gcc (a: {
|
||||
name = "gcc-debug-4.7.0rc20120302";
|
||||
src = fetchurl {
|
||||
|
@ -1944,11 +1943,11 @@ let
|
|||
|
||||
configureFlags = a.configureFlags
|
||||
# This flag replaces `no-sys-dirs.patch'.
|
||||
+ " --with-native-system-header-dir=${stdenv.glibc}/include";
|
||||
+ (lib.optionalString (stdenv ? glibc)
|
||||
" --with-native-system-header-dir=${stdenv.glibc}/include");
|
||||
|
||||
patches = [];
|
||||
})));
|
||||
*/
|
||||
|
||||
gccApple =
|
||||
wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc/4.2-apple32 else import ../development/compilers/gcc/4.2-apple64) {
|
||||
|
|
Loading…
Reference in a new issue