public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Raskin 2016-04-16 08:40:12 +02:00
parent 4b9e9703d4
commit 909a46ff77
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -218,7 +218,8 @@ stdenv.mkDerivation ({
inherit patches; 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; setOutputFlags = false;
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;
@ -316,7 +317,7 @@ stdenv.mkDerivation ({
) )
fi fi
'' ''
+ stdenv.lib.optionalString langJava '' + stdenv.lib.optionalString (langJava || langGo) ''
export lib=$out; export lib=$out;
'' ''
; ;