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

gcc49 (gcj): do not create separate lib output (cyclical dependency), fix ecj1 linking. Does not affect the hash of normal gcc49

Browse Source
This commit is contained in:
Michael Raskin 2016-04-13 18:46:06 +02:00
parent 14b8bdc01f
commit cd5b677576
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,7 @@ stdenv.mkDerivation ({
inherit patches; inherit patches;
outputs = [ "out" "lib" "man" "info" ]; outputs = if langJava then ["out" "man" "info"] else [ "out" "lib" "man" "info" ];
setOutputFlags = false; setOutputFlags = false;
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;
@ -315,7 +315,11 @@ stdenv.mkDerivation ({
FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
) )
fi fi
''; ''
+ stdenv.lib.optionalString langJava ''
export lib=$out;
''
;
dontDisableStatic = true; dontDisableStatic = true;
@ -538,4 +542,10 @@ stdenv.mkDerivation ({
// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
// optionalAttrs (langJava) {
postFixup = ''
target="$(echo "$out/libexec/gcc"/*/*/ecj*)"
patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
'';}
) )