mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-08 12:40:49 -08:00
* src/Makefile.in (emacs$(EXEEXT)): Don't check for load-path shadows.
It has nothing to do with building Emacs, and no-one is likely to be paying attention to the result. The CANNOT_DUMP branch was pointless, since it sets EMACSLOADPATH=$(lispsource) it is impossible for there to ever be any shadows. The EMACSLOADPATH setting was probably necessary for emacs to work at all when uninstalled, given the way init_lread works for the CANNOT_DUMP case. Since -batch implies -q, in the non-CANNOT_DUMP branch, any shadows could only come from site-lisp files.
This commit is contained in:
parent
38182d901d
commit
8eb876e22c
2 changed files with 4 additions and 4 deletions
|
|
@ -1,3 +1,7 @@
|
|||
2012-07-06 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (emacs$(EXEEXT)): Don't check for load-path shadows.
|
||||
|
||||
2012-07-05 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
More xmalloc and related cleanup.
|
||||
|
|
|
|||
|
|
@ -395,7 +395,6 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
|
|||
$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
|
||||
cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
|
||||
|
||||
## Does anyone ever pay attention to the load-path-shadows output here?
|
||||
## The dumped Emacs is as functional and more efficient than
|
||||
## bootstrap-emacs, so we replace the latter with the former.
|
||||
## Strictly speaking, emacs does not depend directly on all of $lisp,
|
||||
|
|
@ -404,13 +403,10 @@ $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
|
|||
emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el
|
||||
if test "$(CANNOT_DUMP)" = "yes"; then \
|
||||
ln -f temacs$(EXEEXT) emacs$(EXEEXT); \
|
||||
EMACSLOADPATH=$(lispsource) ./emacs -batch \
|
||||
-f list-load-path-shadows || true; \
|
||||
else \
|
||||
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
|
||||
test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
|
||||
ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
|
||||
./emacs -batch -f list-load-path-shadows || true; \
|
||||
fi
|
||||
|
||||
## We run make-docfile twice because the command line may get too long
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue