aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-07-05 21:29:54 -0400
committerGlenn Morris2012-07-05 21:29:54 -0400
commit8eb876e22c68e209e9bd4bb781cfacf4b1eee4c6 (patch)
tree30a38a8c9bee5ee334964c954cbaaab971c2ebd0
parent38182d901d030c7d65f4aa7a49b583afb30eb9b7 (diff)
downloademacs-8eb876e22c68e209e9bd4bb781cfacf4b1eee4c6.tar.gz
emacs-8eb876e22c68e209e9bd4bb781cfacf4b1eee4c6.zip
* 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.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d3035fe22a2..7189f930333 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-07-06 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (emacs$(EXEEXT)): Don't check for load-path shadows.
4
12012-07-05 Paul Eggert <eggert@cs.ucla.edu> 52012-07-05 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 More xmalloc and related cleanup. 7 More xmalloc and related cleanup.
diff --git a/src/Makefile.in b/src/Makefile.in
index b0adf53a9b1..da458b4fb8a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -395,7 +395,6 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
395$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) 395$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
396 cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe) 396 cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
397 397
398## Does anyone ever pay attention to the load-path-shadows output here?
399## The dumped Emacs is as functional and more efficient than 398## The dumped Emacs is as functional and more efficient than
400## bootstrap-emacs, so we replace the latter with the former. 399## bootstrap-emacs, so we replace the latter with the former.
401## Strictly speaking, emacs does not depend directly on all of $lisp, 400## Strictly speaking, emacs does not depend directly on all of $lisp,
@@ -404,13 +403,10 @@ $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
404emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el 403emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el
405 if test "$(CANNOT_DUMP)" = "yes"; then \ 404 if test "$(CANNOT_DUMP)" = "yes"; then \
406 ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ 405 ln -f temacs$(EXEEXT) emacs$(EXEEXT); \
407 EMACSLOADPATH=$(lispsource) ./emacs -batch \
408 -f list-load-path-shadows || true; \
409 else \ 406 else \
410 LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \ 407 LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
411 test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \ 408 test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
412 ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ 409 ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
413 ./emacs -batch -f list-load-path-shadows || true; \
414 fi 410 fi
415 411
416## We run make-docfile twice because the command line may get too long 412## We run make-docfile twice because the command line may get too long