diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 961f0d8cc4a..a8fcef31e1b 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -43,6 +43,9 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert stdenv.isDarwin -> gnused != null; +# The go frontend is written in c++ +assert langGo -> langCC; + with stdenv.lib; with builtins; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e0f129410b..6dfa3ac8748 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2206,18 +2206,12 @@ let inherit fetchurl stdenv; }); - gccgo = gccgo46; - - gccgo46 = wrapGCC (gcc46_real.gcc.override { - name = "gccgo"; - langCC = true; #required for go - langC = true; - langGo = true; - }); + # gccgo46 does not work. I set 4.7 then. + gccgo = gccgo47; gccgo47 = wrapGCC (gcc47_real.gcc.override { name = "gccgo"; - langCC = true; #required for go + langCC = true; #required for go. langC = true; langGo = true; });