fix compilation so we can build a statically linked gcc with an impure environment. Needs "noSysDirs = false" passed as a parameter in all-packages.nix, or whatever.

svn path=/nixpkgs/trunk/; revision=6247

2 files changed, 3 insertions, 3 deletions

diff --git a/pkgs/development/compilers/gcc-static-3.4/builder.sh b/pkgs/development/compilers/gcc-static-3.4/builder.sh
index 728ddc74607..b0337bdaa71 100644
--- a/pkgs/development/compilers/gcc-static-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-static-3.4/builder.sh
@@ -41,8 +41,8 @@ if test "$noSysDirs" = "1"; then
         export LDFLAGS=$extraLDFlags
     fi
 
-else
-    patches=""
+#else
+#    patches=""
 fi
 
 
diff --git a/pkgs/development/compilers/gcc-static-3.4/default.nix b/pkgs/development/compilers/gcc-static-3.4/default.nix
index 1b3c473d1e8..1f46a2f2922 100644
--- a/pkgs/development/compilers/gcc-static-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-static-3.4/default.nix
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
     md5 = "4a21ac777d4b5617283ce488b808da7b";
   };
   # !!! apply only if noSysDirs is set
-  patches = [./no-sys-dirs.patch];
   inherit noSysDirs;
+  patches = if noSysDirs then [./no-sys-dirs.patch] else [./ldflags.patch];
 }