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

+12 -2
+12 -2
pkgs/development/compilers/gcc/4.9/default.nix
··· 218 218 219 219 inherit patches; 220 220 221 - outputs = [ "out" "lib" "man" "info" ]; 221 + outputs = if langJava then ["out" "man" "info"] else [ "out" "lib" "man" "info" ]; 222 222 setOutputFlags = false; 223 223 NIX_NO_SELF_RPATH = true; 224 224 ··· 315 315 FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ 316 316 ) 317 317 fi 318 - ''; 318 + '' 319 + + stdenv.lib.optionalString langJava '' 320 + export lib=$out; 321 + '' 322 + ; 319 323 320 324 dontDisableStatic = true; 321 325 ··· 538 542 // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } 539 543 540 544 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } 545 + 546 + // optionalAttrs (langJava) { 547 + postFixup = '' 548 + target="$(echo "$out/libexec/gcc"/*/*/ecj*)" 549 + patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" 550 + '';} 541 551 )