From 706b80c28223486d84ae1e809323fc553b271438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 18:52:32 +0000 Subject: [PATCH] I wrote bad my attempt at -static-libgcc. Retrying. svn path=/nixpkgs/branches/stdenv-updates/; revision=30024 --- pkgs/development/libraries/zlib/default.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 631cd50dd68..13157601e6f 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { # 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) - NIX_LDFLAGS = "-static-libgcc"; + NIX_CFLAGS_COMPILE = "-static-libgcc"; crossAttrs = { dontStrip = if static then true else false; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 59082aa2f27..2eb9d43bcbe 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # 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) - NIX_LDFLAGS = "-static-libgcc"; + NIX_CFLAGS_COMPILE = "-static-libgcc"; configureFlags = "--disable-werror" # needed for dietlibc build + stdenv.lib.optionalString (stdenv.system == "mips64-linux")