From 2b3d751095e2e4e7806c603e49d905755063888d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Apr 2011 10:36:53 +0000 Subject: [PATCH] Use install-strip when installing a stripped GCC 4.6 svn path=/nixpkgs/trunk/; revision=26652 --- pkgs/development/compilers/gcc-4.6/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index a157d328fa1..52497a3f2b5 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -268,6 +268,11 @@ stdenv.mkDerivation ({ targetConfig = if (cross != null) then cross.config else null; + installTargets = + if stripped + then "install-strip" + else "install"; + crossAttrs = { AR = "${stdenv.cross.config}-ar"; LD = "${stdenv.cross.config}-ld"; @@ -404,8 +409,6 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -# GCC 4.6.0 DOES support the `install-strip' target, but we'll let`stdenv' do -# the stripping by default to match stdenv-updates, for now // optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; } // optionalAttrs langVhdl rec {