pyrox.dev
lol
gcc-4.8: fix build
Problems: building with gcc-6 now, and fallout after output changes #27424.
+10
-3
+10
-3
pkgs/development/compilers/gcc/4.8/default.nix
+10
-3
pkgs/development/compilers/gcc/4.8/default.nix
···
1
-
{ stdenv, fetchurl, noSysDirs
1
+
{ stdenv, fetchurl, fetchpatch, noSysDirs
2
2
, langC ? true, langCC ? true, langFortran ? false
3
3
, langObjC ? targetPlatform.isDarwin
4
4
, langObjCpp ? targetPlatform.isDarwin
···
71
71
# target libraries and tools.
72
72
++ optional langAda ../gnat-cflags.patch
73
73
++ optional langFortran ../gfortran-driving.patch
74
-
++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch;
74
+
++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch
75
+
++ [(fetchpatch {
76
+
name = "libc_name_p.diff"; # needed to build with gcc6
77
+
url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1";
78
+
sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl";
79
+
excludes = [ "gcc/cp/ChangeLog" ];
80
+
})]
81
+
;
75
82
76
83
javaEcj = fetchurl {
77
84
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
···
218
225
219
226
hardeningDisable = [ "format" ];
220
227
221
-
outputs = [ "out" "lib" "doc" ];
228
+
outputs = [ "out" "lib" "man" "info" ];
222
229
setOutputFlags = false;
223
230
NIX_NO_SELF_RPATH = true;
224
231