diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-01-19 23:56:28 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-01-19 23:56:28 -0800 |
| commit | f952002e0ad535c15f70efd1011059e3fb97d50b (patch) | |
| tree | 8cb39fc844d7b81f9ba2858ced2e540cbfa984a3 /lisp/Makefile.in | |
| parent | 8251c3f8f5af438b1c8ef5b14a1080d610b71f65 (diff) | |
| download | emacs-f952002e0ad535c15f70efd1011059e3fb97d50b.tar.gz | |
Revert some of the CANNOT_DUMP fix.
Because of this, "make bootstrap" won't work if CANNOT_DUMP=yes,
but fixing this can wait until after the next release.
* leim/Makefile.in (RUN_EMACS): Keep EMACSLOADPATH empty.
* lisp/Makefile.in (emacs): Keep EMACSLOADPATH empty.
* src/lread.c (init_lread): Fix typo: NILP, not !NILP.
Fixes: debbugs:16494
Diffstat (limited to 'lisp/Makefile.in')
| -rw-r--r-- | lisp/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index c2c108334a8..ebd2432e10c 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -89,7 +89,8 @@ BIG_STACK_DEPTH = 2200 BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))" # Set load-prefer-newer for the benefit of the non-bootstrappers. -BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) --eval '(setq load-prefer-newer t)' $(BYTE_COMPILE_EXTRA_FLAGS) +BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) \ + --eval '(setq load-prefer-newer t)' $(BYTE_COMPILE_EXTRA_FLAGS) # Files to compile before others during a bootstrap. This is done to # speed up the bootstrap process. They're ordered by size, so we use @@ -106,7 +107,8 @@ COMPILE_FIRST = \ $(lisp)/emacs-lisp/autoload.elc # The actual Emacs command run in the targets below. -emacs = EMACSLOADPATH='$(lisp)' '$(EMACS)' $(EMACSOPT) +# Prevent any setting of EMACSLOADPATH in user environment causing problems. +emacs = EMACSLOADPATH= '$(EMACS)' $(EMACSOPT) # Common command to find subdirectories setwins=for file in `find . -type d -print`; do \ |