From 61b4bdded460ea943e3d627722152868e35958a0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 20 Aug 2015 04:51:07 +0300 Subject: [PATCH] gcc 4.9: Port multiple-outputs changes from gcc 4.8 --- pkgs/development/compilers/gcc/4.9/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 8b2fda05095c..46f070322650 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -217,6 +217,12 @@ stdenv.mkDerivation ({ inherit patches; + outputs = [ "out" "lib" "doc" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + postPatch = if (stdenv.isGNU || (libcCross != null # e.g., building `gcc.crossDrv'