mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-21 05:01:06 +02:00
GCC 4.5.2: Don't use the `install-strip' target, which wasn't available.
svn path=/nixpkgs/branches/stdenv-updates/; revision=26579
This commit is contained in:
parent
3e68d94b22
commit
312680ff50
|
@ -260,11 +260,6 @@ 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";
|
||||||
|
@ -399,6 +394,8 @@ stdenv.mkDerivation ({
|
||||||
installTargets = "install-gcc install-target-libgcc";
|
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 (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; }
|
||||||
|
|
||||||
// optionalAttrs langVhdl rec {
|
// optionalAttrs langVhdl rec {
|
||||||
|
|
Loading…
Reference in a new issue