emacs-23: apply the crt{1,i,n}.o patch only on Linux

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

1 files changed, 10 insertions, 5 deletions

diff --git a/pkgs/applications/editors/emacs-23/builder.sh b/pkgs/applications/editors/emacs-23/builder.sh
index a975fa4601eb..d04e7a4fdd3f 100644
--- a/pkgs/applications/editors/emacs-23/builder.sh
+++ b/pkgs/applications/editors/emacs-23/builder.sh
@@ -1,14 +1,19 @@
 source $stdenv/setup
 
+# This hook is supposed to be run on Linux. It patches the proper locations of
+# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with
+# *our* versions, not the ones found in the system, as it would do by default.
+# On other platforms, this appears to be unnecessary.
 preConfigure() {
-    libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
-    echo "libc: $libc"
-
     case "${system}" in
-	x86_64-*)	glibclibdir=lib64 ;;
-	*)		glibclibdir=lib ;;
+	x86_64-linux)	glibclibdir=lib64 ;;
+	i686-linux)	glibclibdir=lib ;;
+        *)              return;
     esac
 
+    libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
+    echo "libc: $libc"
+
     for i in src/s/*.h src/m/*.h; do
         substituteInPlace $i \
             --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \