about summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2011-04-05 16:55:09 +0000
committerShea Levy <shea@shealevy.com>2011-04-05 16:55:09 +0000
commit76610988f880dd790cee398817d8744766527bf3 (patch)
tree55aa7ad7ad5439510bc20b0165aeef190a20d3ca
parent566a2eba7456de7b97213f8bc643bd005c5f2d30 (diff)
downloadnixlib-76610988f880dd790cee398817d8744766527bf3.tar
nixlib-76610988f880dd790cee398817d8744766527bf3.tar.gz
nixlib-76610988f880dd790cee398817d8744766527bf3.tar.bz2
nixlib-76610988f880dd790cee398817d8744766527bf3.tar.lz
nixlib-76610988f880dd790cee398817d8744766527bf3.tar.xz
nixlib-76610988f880dd790cee398817d8744766527bf3.tar.zst
nixlib-76610988f880dd790cee398817d8744766527bf3.zip
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

svn path=/nixpkgs/trunk/; revision=26702
-rw-r--r--pkgs/development/compilers/gcc-4.6/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix
index 827540b9cab0..90eabe9e7a41 100644
--- a/pkgs/development/compilers/gcc-4.6/default.nix
+++ b/pkgs/development/compilers/gcc-4.6/default.nix
@@ -221,8 +221,7 @@ stdenv.mkDerivation ({
 
   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"}