* Disable Graphite in GCC, as discussed on the mailing list.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19547
This commit is contained in:
parent
d348b996cf
commit
8cd183f062
@ -1908,7 +1908,7 @@ let
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
gcc44_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) {
|
gcc44_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) {
|
||||||
inherit fetchurl stdenv texinfo gmp mpfr ppl cloogppl
|
inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */
|
||||||
gettext which noSysDirs;
|
gettext which noSysDirs;
|
||||||
profiledCompiler = true;
|
profiledCompiler = true;
|
||||||
}));
|
}));
|
||||||
@ -3704,10 +3704,9 @@ let
|
|||||||
|
|
||||||
gmp = import ../development/libraries/gmp {
|
gmp = import ../development/libraries/gmp {
|
||||||
inherit stdenv fetchurl m4;
|
inherit stdenv fetchurl m4;
|
||||||
|
cxx = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# `gmpxx' used to mean "GMP with C++ bindings". Now `gmp' has C++ bindings
|
|
||||||
# by default, so that distinction is obsolete.
|
|
||||||
gmpxx = gmp;
|
gmpxx = gmp;
|
||||||
|
|
||||||
goffice = import ../development/libraries/goffice {
|
goffice = import ../development/libraries/goffice {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user