From: Vibhav Pant <vibhavp@gmail.com>
Date: Tue, 6 Jun 2023 14:00:27 +0000 (+0530)
Subject: Merge branch 'master' into scratch/comp-static-data
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49ffcbf86a32a8a217538d4df3736fe069ccf35d;p=emacs.git

Merge branch 'master' into scratch/comp-static-data
---

49ffcbf86a32a8a217538d4df3736fe069ccf35d
diff --cc lisp/Makefile.in
index b459de49a96,fbe502cec6d..3477ef8c856
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@@ -71,17 -71,13 +71,18 @@@ loaddefs = $(shell find ${srcdir} -nam
  AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \
    ${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el
  
 +# Additional flags to pass while compiling *.eln files
 +ELN_COMPILE_FLAGS =
 +
  # 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)
 +compile-first: ELN_COMPILE_FLAGS = \
 +  --eval "(setq native-comp-compile-static-data nil)"
  
  # 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