From 312680ff5089785b86756a7709aac2e0b3c92e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 28 Mar 2011 16:11:16 +0000 Subject: [PATCH] GCC 4.5.2: Don't use the `install-strip' target, which wasn't available. svn path=/nixpkgs/branches/stdenv-updates/; revision=26579 --- pkgs/development/compilers/gcc-4.5/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index abe6186ef96..1acbb82702b 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -260,11 +260,6 @@ 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"; @@ -399,6 +394,8 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } +# GCC 4.5.2 doesn't support the `install-strip' target, so let `stdenv' do +# the stripping by default. // optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; } // optionalAttrs langVhdl rec {