From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 20 Nov 2021 16:17:59 +0000 (+0200)
Subject: Fix temacs invocation from outside of the 'src' directory
X-Git-Tag: emacs-28.0.90~51
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e437af41319330ddade02d9784cf78c8e6674d8;p=emacs.git

Fix temacs invocation from outside of the 'src' directory

* src/emacs.c (main) [HAVE_NATIVE_COMP]: Recompute the value of
native-comp-eln-load-path if about to load loadup in uninitialized
Emacs.  (Bug#51999)
---

diff --git a/src/emacs.c b/src/emacs.c
index 866e43fda94..41c92a46155 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2284,6 +2284,17 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       /* Unless next switch is -nl, load "loadup.el" first thing.  */
       if (! no_loadup)
 	Vtop_level = list2 (Qload, build_string ("loadup.el"));
+
+#ifdef HAVE_NATIVE_COMP
+      /* If we are going to load stuff in a non-initialized Emacs,
+	 update the value of native-comp-eln-load-path, so that the
+	 *.eln files will be found if they are there.  */
+      if (!NILP (Vtop_level) && !temacs)
+	Vnative_comp_eln_load_path =
+	  Fcons (Fexpand_file_name (XCAR (Vnative_comp_eln_load_path),
+				    Vinvocation_directory),
+		 Qnil);
+#endif
     }
 
   /* Set up for profiling.  This is known to work on FreeBSD,