* New bootstrap binaries (from r16022 in the trunk). Don't set

LD_LIBRARY_PATH since it breaks /bin/sh on non-NixOS platforms (and
  reverted the previous "fix" in r15470).

svn path=/nixpkgs/branches/stdenv-updates/; revision=16029

pkgs/development/libraries/glibc-2.9/builder.sh

@@ -1,6 +1,5 @@
-# glibc cannot have itself in its rpath.
+# Glibc cannot have itself in its RPATH.
 export NIX_NO_SELF_RPATH=1
-export NIX_DONT_SET_RPATH=1
 
 source $stdenv/setup
 
@@ -41,6 +40,8 @@ postConfigure() {
     # test binaries.
     export NIX_CFLAGS_LINK=
     export NIX_LDFLAGS_BEFORE=
+
+    export NIX_DONT_SET_RPATH=1
 }