From: Andrea Corallo <akrl@sdf.org>
Date: Fri, 21 May 2021 06:44:55 +0000 (+0200)
Subject: * Fix ahead-of-time native compilation for out-of-tree builds (bug#48497)
X-Git-Tag: emacs-28.0.90~2373
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f207753a06453ab97d1a28ede89eb56cf425092;p=emacs.git

* Fix ahead-of-time native compilation for out-of-tree builds (bug#48497)

* src/comp.c (Fcomp_el_to_eln_rel_filename): Expand
'PATH_DUMPLOADSEARCH' while computing 'loadsearch_re_list'.
---

diff --git a/src/comp.c b/src/comp.c
index c0445050b71..340ed850387 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4056,7 +4056,8 @@ DEFUN ("comp-el-to-eln-rel-filename", Fcomp_el_to_eln_rel_filename,
       Lisp_Object sys_re =
 	concat2 (build_string ("\\`[[:ascii:]]+"),
 		 Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/")));
-      Lisp_Object dump_load_search = build_string (PATH_DUMPLOADSEARCH "/");
+      Lisp_Object dump_load_search =
+	Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil);
 #ifdef WINDOWSNT
       dump_load_search = Fw32_long_file_name (dump_load_search);
 #endif