src_Makefile.in.diff [plain text]
--- src/Makefile.in 2007-03-21 07:31:24.000000000 -0700
+++ src/Makefile.in 2008-10-24 15:08:14.000000000 -0700
@@ -952,16 +952,35 @@ RUN_TEMACS = ./temacs
all: emacs${EXEEXT} OTHER_FILES
++NL=-nl
+ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
rm -f emacs${EXEEXT}
ln temacs${EXEEXT} emacs${EXEEXT}
-- LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump
-- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
-++ifneq (1,$(words $(RC_ARCHS)))
+ mv temacs emacs-undumped
+ifeq (i386,$(filter i386,$(RC_ARCHS)))
+ lipo -thin i386 -output temacs emacs-undumped
+ LC_ALL=C $(RUN_TEMACS) $(NL) -batch -l loadup dump
+ mv emacs arch/emacs-i386
+ rm -f emacs-[0-9]* +endif
+ifeq (x86_64,$(filter x86_64,$(RC_ARCHS)))
+ lipo -thin x86_64 -output temacs emacs-undumped
+ LC_ALL=C $(RUN_TEMACS) $(NL) -batch -l loadup dump
+ mv emacs arch/emacs-x86_64
+ rm -f emacs-[0-9]* +endif
+ lipo -create -output emacs "arch/"*
+ cp emacs-undumped temacs
+else
+ cp temacs emacs-undumped
+ LC_ALL=C $(RUN_TEMACS) $(NL) -batch -l loadup dump
+endif
-./emacs -q -batch -f list-load-path-shadows
@@ -1382,6 +1393,11 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT
#ifdef CANNOT_DUMP
ln temacs${EXEEXT} bootstrap-emacs${EXEEXT}
#else
+ if [ -n "`file temacs | grep 'Mach-O universal binary'`" ]; then \
+ mv temacs emacs-undumped; \
+ lipo -thin `$(SRCROOT)/filearch.rb emacs-undumped` -output temacs emacs-undumped; \
+ rm emacs-undumped; \
+ fi
#ifdef HAVE_SHM
$(RUN_TEMACS) -nl -batch -l loadup bootstrap
#else /* ! defined (HAVE_SHM) */