From 76610988f880dd790cee398817d8744766527bf3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 5 Apr 2011 16:55:09 +0000 Subject: [PATCH] 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 --- pkgs/development/compilers/gcc-4.6/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 827540b9cab..90eabe9e7a4 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"}