diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-22 12:30:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-22 12:30:04 +0200 |
| commit | b2ae23a391a5bccb6f92fd16986936c9b288b511 (patch) | |
| tree | 3b6ad4b8e1b3e426f5c59e52dfca643f21632709 /pkgs/development/compilers | |
| parent | 964799e556222b5115ca61823fd671488f8e718d (diff) | |
| parent | d2e9836aa66378ec846d8d317e21a70709ba93d2 (diff) | |
| download | nixlib-b2ae23a391a5bccb6f92fd16986936c9b288b511.tar nixlib-b2ae23a391a5bccb6f92fd16986936c9b288b511.tar.gz nixlib-b2ae23a391a5bccb6f92fd16986936c9b288b511.tar.bz2 nixlib-b2ae23a391a5bccb6f92fd16986936c9b288b511.tar.lz nixlib-b2ae23a391a5bccb6f92fd16986936c9b288b511.tar.xz nixlib-b2ae23a391a5bccb6f92fd16986936c9b288b511.tar.zst nixlib-b2ae23a391a5bccb6f92fd16986936c9b288b511.zip | |
Merge branch 'staging' (older version)
This just adds some fixups, not any mass rebuild.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 3 |
2 files changed, 11 insertions, 5 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; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 1380d36725a1..e45ee0bcc6a7 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -72,8 +72,7 @@ let version = "4.9.4"; # target libraries and tools. ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch - # The NXConstStr.patch can be removed at 4.9.4 - ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch; + ; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at |