Author: shlevy
Date: Fri Apr 1 10:36:53 2011
New Revision: 26652
URL: https://svn.nixos.org/websvn/nix/?rev=26652&sc=1
Log:
Use install-strip when installing a stripped GCC 4.6
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Fri Apr
1 07:40:06 2011 (r26651)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Fri Apr
1 10:36:53 2011 (r26652)
@@ -268,6 +268,11 @@
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 @@
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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
