diff --git a/pkgs/applications/editors/emacs-22/builder.sh b/pkgs/applications/editors/emacs-22/builder.sh index 6bb6c54a5b8..fe32b10e914 100644 --- a/pkgs/applications/editors/emacs-22/builder.sh +++ b/pkgs/applications/editors/emacs-22/builder.sh @@ -5,11 +5,16 @@ preConfigure() { libc=$(cat ${NIX_GCC}/nix-support/orig-libc) echo "libc: $libc" + case "${system}" in + x86_64-*) glibclibdir=lib64 ;; + *) glibclibdir=lib ;; + esac + 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 + --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \ + --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \ + --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o done for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do