Fix gccgo by un-splitting lib output (like gcj)

2016-04-16 08:40:12 +02:00 · 2016-04-16 08:40:12 +02:00 · 909a46ff77
commit 909a46ff77
parent 4b9e9703d4
1 changed files with 5 additions and 4 deletions
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@ -218,7 +218,8 @@ stdenv.mkDerivation ({

  inherit patches;

-  outputs = if langJava then ["out" "man" "info"] else [ "out" "lib" "man" "info" ];
+  outputs = if langJava || langGo then ["out" "man" "info"]
+    else [ "out" "lib" "man" "info" ];
  setOutputFlags = false;
  NIX_NO_SELF_RPATH = true;

@ -316,7 +317,7 @@ stdenv.mkDerivation ({
      )
    fi
  ''
-  + stdenv.lib.optionalString langJava ''
+  + stdenv.lib.optionalString (langJava || langGo) ''
    export lib=$out;
  ''
  ;