diff options
Diffstat (limited to 'lisp/Makefile.in')
| -rw-r--r-- | lisp/Makefile.in | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 521558a9598..95cb6a97213 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -72,9 +72,10 @@ AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \ ${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el # Set load-prefer-newer for the benefit of the non-bootstrappers. +# Set org--inhibit-version-check to avoid unnecessarily aborting the build. BYTE_COMPILE_FLAGS = \ --eval "(setq load-prefer-newer t byte-compile-warnings 'all)" \ - $(BYTE_COMPILE_EXTRA_FLAGS) + --eval "(setq org--inhibit-version-check t)" $(BYTE_COMPILE_EXTRA_FLAGS) # ... but we must prefer .elc files for those in the early bootstrap. compile-first: BYTE_COMPILE_FLAGS = $(BYTE_COMPILE_EXTRA_FLAGS) @@ -94,6 +95,8 @@ COMPILE_FIRST = \ ifeq ($(HAVE_NATIVE_COMP),yes) COMPILE_FIRST += $(lisp)/emacs-lisp/comp.elc COMPILE_FIRST += $(lisp)/emacs-lisp/comp-cstr.elc +COMPILE_FIRST += $(lisp)/emacs-lisp/comp-common.elc +COMPILE_FIRST += $(lisp)/emacs-lisp/comp-run.elc endif COMPILE_FIRST += $(lisp)/emacs-lisp/loaddefs-gen.elc COMPILE_FIRST += $(lisp)/emacs-lisp/radix-tree.elc @@ -350,11 +353,7 @@ compile-first: $(COMPILE_FIRST) # TARGETS is set dynamically in the recursive call from 'compile-main'. # Do not build comp.el unless necessary not to exceed max-lisp-eval-depth # in normal builds. -ifneq ($(HAVE_NATIVE_COMP),yes) -compile-targets: $(filter-out ./emacs-lisp/comp-cstr.elc,$(filter-out ./emacs-lisp/comp.elc,$(TARGETS))) -else compile-targets: $(TARGETS) -endif # Compile all the Elisp files that need it. Beware: it approximates # 'no-byte-compile', so watch out for false-positives! @@ -525,8 +524,8 @@ check-declare: ## This finds a lot of duplicates between foo.el and obsolete/foo.el. check-defun-dups: sed -n -e '/^(defun /s/\(.\)(.*/\1/p' \ - $$(find . -name '*.el' ! -name '.*' -print | \ - grep -Ev '(loaddefs|ldefs-boot)\.el|obsolete') | sort | uniq -d + `find . -name '*.el' ! -name '.*' -print | \ + grep -Ev '(loaddefs|ldefs-boot)\.el|obsolete'` | sort | uniq -d # Dependencies |