Author: viric
Date: Tue Oct 25 18:52:32 2011
New Revision: 30024
URL: https://nixos.org/websvn/nix/?rev=30024&sc=1
Log:
I wrote bad my attempt at -static-libgcc. Retrying.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
Tue Oct 25 18:35:41 2011 (r30023)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
Tue Oct 25 18:52:32 2011 (r30024)
@@ -19,7 +19,7 @@
# 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;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Tue Oct 25 18:35:41 2011 (r30023)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/default.nix
Tue Oct 25 18:52:32 2011 (r30024)
@@ -55,7 +55,7 @@
# 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")
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
