Author: shlevy
Date: Tue Apr 5 16:55:09 2011
New Revision: 26702
URL: https://svn.nixos.org/websvn/nix/?rev=26702&sc=1
Log:
Remove --with-stage1-libs from gcc-4.6.0 when building against a static ppl
--with-stage1-libs defaults to whatever is passed to --with-host-libstdcxx, and
building gcc 4.6.0 against a static ppl fails when --with-stage1-libs is
specified as it is here
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Tue Apr
5 16:14:23 2011 (r26701)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Tue Apr
5 16:55:09 2011 (r26702)
@@ -221,8 +221,7 @@
configureFlagsArray = stdenv.lib.optionals
(ppl != null && ppl.dontDisableStatic == true)
- [ "--with-host-libstdcxx=-lstdc++ -lgcc_s"
- "--with-stage1-libs=-lstdc++ -lgcc_s" ];
+ [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ];
configureFlags = "
${if enableMultilib then "" else "--disable-multilib"}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
