diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2858a2694aa..8be77814576 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1908,7 +1908,7 @@ let
   }));
 
   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;
     profiledCompiler = true;
   }));
@@ -3704,10 +3704,9 @@ let
 
   gmp = import ../development/libraries/gmp {
     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;
 
   goffice = import ../development/libraries/goffice {