From b4214da14e56079b6cabbd9fa50bf9b9d07523ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Nov 2014 22:38:57 +0100 Subject: [PATCH] gcc_multi: sync the change to 4.6 and 4.9 as well --- pkgs/development/compilers/gcc/4.6/default.nix | 2 ++ pkgs/development/compilers/gcc/4.9/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 8528be07729..0f08a908bfd 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -474,6 +474,8 @@ stdenv.mkDerivation ({ # Strip kills static libs of other archs (hence cross != null) // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } + // optionalAttrs langVhdl rec { name = "ghdl-0.29"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 40244cab94f..1cda4535efc 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -512,4 +512,6 @@ stdenv.mkDerivation ({ # Strip kills static libs of other archs (hence cross != null) // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } )