* Renamed orig-glibc -> orig-libc in some places, and in others, use

the new $NIX_GCC/nix-support/dynamic-linker file to locate the
  dynamic linker directly (don't hardcode ld-linux.so.2).

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

pkgs/development/compilers/ghc/boot.sh

@@ -2,9 +2,8 @@ source $stdenv/setup
 
 postBuild=postBuild
 postBuild () {
-    glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
     find . -type f -perm +100 \
-        -exec patchelf --interpreter $glibc/lib/ld-linux.so.* \
+        -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
         --set-rpath "$readline/lib:$ncurses/lib" {} \;
 }
 

pkgs/development/compilers/jdk/builder.sh

@@ -35,9 +35,8 @@ rpath=
 for i in $libraries; do
     rpath=$rpath${rpath:+:}$i/lib
 done
-glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
 find $out -type f -perm +100 \
-    -exec patchelf --interpreter $glibc/lib/ld-linux.so.* \
+    -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
     --set-rpath "$rpath" {} \;
 
 # Unpack .pack files.

pkgs/development/interpreters/perl/builder.sh

@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
+if test "$NIX_ENFORCE_PURITY" = "1"; then
     GLIBC=$(cat $NIX_GCC/nix-support/orig-libc)
     extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib"
 fi