mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Code Issues 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

9
pkgs/development/compilers/gcc/4.9/default.nix
View file

@ -73,8 +73,8 @@ let version = "4.9.3";
++ optional langAda ../gnat-cflags.patch
++ optional langFortran ../gfortran-driving.patch
# The NXConstStr.patch can be removed at 4.9.4
++ optional stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch;
++ optional stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch;
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
# `configure' time.
@ -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;
''
;