more pervasive crt-patching in emacs snapshot to make it work on my machine

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

1 files changed, 6 insertions, 4 deletions

diff --git a/pkgs/applications/editors/emacs-unicode/builder.sh b/pkgs/applications/editors/emacs-unicode/builder.sh
index 8b53ade4f97c..03dc2ac70beb 100644
--- a/pkgs/applications/editors/emacs-unicode/builder.sh
+++ b/pkgs/applications/editors/emacs-unicode/builder.sh
@@ -5,10 +5,12 @@ preConfigure() {
     libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
     echo "libc: $libc"
 
-    substituteInPlace src/s/gnu-linux.h \
-        --replace /usr/lib/crt1.o $libc/lib/crt1.o \
-        --replace /usr/lib/crti.o $libc/lib/crti.o \
-        --replace /usr/lib/crtn.o $libc/lib/crtn.o
+    for i in src/s/*.h src/m/*.h; do
+        substituteInPlace $i \
+            --replace /usr/lib/crt1.o $libc/lib/crt1.o \
+            --replace /usr/lib/crti.o $libc/lib/crti.o \
+            --replace /usr/lib/crtn.o $libc/lib/crtn.o
+    done
     
     for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in ./admin/unidata/Makefile; do
         substituteInPlace $i --replace /bin/pwd pwd