mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 11:53:27 +00:00
Use install-strip when installing a stripped GCC 4.6
svn path=/nixpkgs/trunk/; revision=26652
This commit is contained in:
parent
93d86b97f6
commit
2b3d751095
@ -268,6 +268,11 @@ stdenv.mkDerivation ({
|
|||||||
|
|
||||||
targetConfig = if (cross != null) then cross.config else null;
|
targetConfig = if (cross != null) then cross.config else null;
|
||||||
|
|
||||||
|
installTargets =
|
||||||
|
if stripped
|
||||||
|
then "install-strip"
|
||||||
|
else "install";
|
||||||
|
|
||||||
crossAttrs = {
|
crossAttrs = {
|
||||||
AR = "${stdenv.cross.config}-ar";
|
AR = "${stdenv.cross.config}-ar";
|
||||||
LD = "${stdenv.cross.config}-ld";
|
LD = "${stdenv.cross.config}-ld";
|
||||||
@ -404,8 +409,6 @@ stdenv.mkDerivation ({
|
|||||||
installTargets = "install-gcc install-target-libgcc";
|
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 (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; }
|
||||||
|
|
||||||
// optionalAttrs langVhdl rec {
|
// optionalAttrs langVhdl rec {
|
||||||
|
Loading…
Reference in New Issue
Block a user