gcc_multi: sync the change to 4.6 and 4.9 as well

pyrox.dev / nixpkgs

fork atom

lol

fork atom

Vladimír Čunát 11 years ago b4214da1 45785039

2 changed files

expand all

pkgs

development

compilers

gcc

4.6

default.nix

4.9

default.nix

pkgs/development/compilers/gcc/4.6/default.nix

··· 474 474 # Strip kills static libs of other archs (hence cross != null) 475 475 // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } 476 476 477 + // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } 478 + 477 479 // optionalAttrs langVhdl rec { 478 480 name = "ghdl-0.29"; 479 481

pkgs/development/compilers/gcc/4.9/default.nix

··· 512 512 513 513 # Strip kills static libs of other archs (hence cross != null) 514 514 // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } 515 + 516 + // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } 515 517 )