diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-20 11:11:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-20 11:11:44 +0200 |
| commit | beaad855004c60ba00989dbc5525b7d28933e1cd (patch) | |
| tree | 8f21260b48feb2f9326d88cc33e8885387cc1ca4 /pkgs/development/compilers/gcc/4.8 | |
| parent | 1919bb504360272242a6856b995df8d291adcecc (diff) | |
| download | nixlib-beaad855004c60ba00989dbc5525b7d28933e1cd.tar nixlib-beaad855004c60ba00989dbc5525b7d28933e1cd.tar.gz nixlib-beaad855004c60ba00989dbc5525b7d28933e1cd.tar.bz2 nixlib-beaad855004c60ba00989dbc5525b7d28933e1cd.tar.lz nixlib-beaad855004c60ba00989dbc5525b7d28933e1cd.tar.xz nixlib-beaad855004c60ba00989dbc5525b7d28933e1cd.tar.zst nixlib-beaad855004c60ba00989dbc5525b7d28933e1cd.zip | |
gcc-4.8: fix build
Problems: building with gcc-6 now, and fallout after output changes #27424.
Diffstat (limited to 'pkgs/development/compilers/gcc/4.8')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ee7ddccced77..7a41ba38e519 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, noSysDirs +{ stdenv, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -71,7 +71,14 @@ let version = "4.8.5"; # target libraries and tools. ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch - ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch; + ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch + ++ [(fetchpatch { + name = "libc_name_p.diff"; # needed to build with gcc6 + url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1"; + sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl"; + excludes = [ "gcc/cp/ChangeLog" ]; + })] + ; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -218,7 +225,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ]; - outputs = [ "out" "lib" "doc" ]; + outputs = [ "out" "lib" "man" "info" ]; setOutputFlags = false; NIX_NO_SELF_RPATH = true; |