3
0
Fork 0
forked from mirrors/nixpkgs

I wrote bad my attempt at -static-libgcc. Retrying.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30024
This commit is contained in:
Lluís Batlle i Rossell 2011-10-25 18:52:32 +00:00
parent 0b1f1a522c
commit 706b80c282
2 changed files with 2 additions and 2 deletions

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
# As zlib takes part in the stdenv building, we don't want references # As zlib takes part in the stdenv building, we don't want references
# to the bootstrap-tools libgcc (as uses to happen on arm/mips) # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
NIX_LDFLAGS = "-static-libgcc"; NIX_CFLAGS_COMPILE = "-static-libgcc";
crossAttrs = { crossAttrs = {
dontStrip = if static then true else false; dontStrip = if static then true else false;

View file

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
# As binutils takes part in the stdenv building, we don't want references # As binutils takes part in the stdenv building, we don't want references
# to the bootstrap-tools libgcc (as uses to happen on arm/mips) # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
NIX_LDFLAGS = "-static-libgcc"; NIX_CFLAGS_COMPILE = "-static-libgcc";
configureFlags = "--disable-werror" # needed for dietlibc build configureFlags = "--disable-werror" # needed for dietlibc build
+ stdenv.lib.optionalString (stdenv.system == "mips64-linux") + stdenv.lib.optionalString (stdenv.system == "mips64-linux")