From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andrea Corallo via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#46256: [feature/native-comp] AOT eln files ignored if run from build tree Date: Fri, 05 Feb 2021 14:39:58 +0000 Message-ID: References: <865z3866my.fsf@gmail.com> Reply-To: Andrea Corallo Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12461"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 46256@debbugs.gnu.org To: Andy Moreton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Feb 05 15:41:18 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l82IP-00038q-Pd for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Feb 2021 15:41:17 +0100 Original-Received: from localhost ([::1]:45970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82IO-0007ua-O5 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Feb 2021 09:41:16 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82I9-0007t7-T6 for bug-gnu-emacs@gnu.org; Fri, 05 Feb 2021 09:41:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82I9-00018Q-LS for bug-gnu-emacs@gnu.org; Fri, 05 Feb 2021 09:41:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l82I9-0001NN-J2 for bug-gnu-emacs@gnu.org; Fri, 05 Feb 2021 09:41:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andrea Corallo Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 05 Feb 2021 14:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46256 X-GNU-PR-Package: emacs Original-Received: via spool by 46256-submit@debbugs.gnu.org id=B46256.16125360025196 (code B ref 46256); Fri, 05 Feb 2021 14:41:01 +0000 Original-Received: (at 46256) by debbugs.gnu.org; 5 Feb 2021 14:40:02 +0000 Original-Received: from localhost ([127.0.0.1]:43262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l82HB-0001Lf-Na for submit@debbugs.gnu.org; Fri, 05 Feb 2021 09:40:02 -0500 Original-Received: from mab.sdf.org ([205.166.94.33]:51448 helo=ma.sdf.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l82HA-0001LQ-1h for 46256@debbugs.gnu.org; Fri, 05 Feb 2021 09:40:00 -0500 Original-Received: from akrl by ma.sdf.org with local (Exim 4.92) (envelope-from ) id 1l82H8-0005Dk-KO; Fri, 05 Feb 2021 14:39:58 +0000 In-Reply-To: <865z3866my.fsf@gmail.com> (Andy Moreton's message of "Thu, 04 Feb 2021 00:03:49 +0000") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:199386 Archived-At: --=-=-= Content-Type: text/plain Andy Moreton writes: > On Wed 03 Feb 2021, akrl--- via "Bug reports for GNU Emacs, the Swiss army knife of text editors" wrote: > >> Andy Moreton writes: >> >>> Hi, >>> >>> I have built emacs native-comp branch for 64bit Mingw64 with >>> NATIVE_FULL_AOT=1 (out of tree, so build dir != source dir). >>> >>> I notice that if I run the built emacs from the build dir then the >>> prebuilt .eln files are ignored, and async compilation of the .eln file >>> happens again to add them to the user eln-cache dir. >>> >>> The prebuilt .eln files are not found in the user eln-cache (expected) >>> or the installed emacs directory (also expected), but it looks like it >>> does not also check the build dir (relative to the running emacs rather >>> than relative to the install prefix). >>> >>> Running from the build dir without installing is common for developers >>> building from source, so it would be useful to keep this working with >>> native AOT builds. >>> >>> AndyM >> >> Hi Andy, >> >> could you share the values of PATH_DUMPLOADSEARCH and >> PATH_REL_LOADSEARCH from your epaths.h ? >> >> Thanks >> >> Andrea > > Native branch checkout is in: "c:/emacs/git/emacs/native/" > > "c:/emacs/git/emacs/native/build/mingw64-x86_64-O2/src/epaths.h" contains: > > #define PATH_DUMPLOADSEARCH "C:/emacs/git/emacs/native/lisp" > #define PATH_REL_LOADSEARCH "28.0.50/lisp" > > > HTH, > > AndyM Hi Andy could you give it a go to the following blind patch? Thanks Andrea --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=46256.patch diff --git a/src/comp.c b/src/comp.c index 289d89d37d..980462b520 100644 --- a/src/comp.c +++ b/src/comp.c @@ -433,6 +433,12 @@ #define TEXT_DATA_RELOC_EPHEMERAL_SYM "text_data_reloc_eph" #define TEXT_OPTIM_QLY_SYM "text_optim_qly" #define TEXT_FDOC_SYM "text_data_fdoc" +#ifdef WINDOWSNT +#define DIR_SLASH "\\" +#else +#define DIR_SLASH "/" +#endif + #define STR_VALUE(s) #s #define STR(s) STR_VALUE (s) @@ -4032,9 +4038,11 @@ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, { Lisp_Object sys_re = concat2 (build_string ("\\`[[:ascii:]]+"), - Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); + Fregexp_quote (build_string (DIR_SLASH PATH_REL_LOADSEARCH + DIR_SLASH))); loadsearch_re_list = - list2 (sys_re, Fregexp_quote (build_string (PATH_DUMPLOADSEARCH "/"))); + list2 (sys_re, Fregexp_quote (build_string (PATH_DUMPLOADSEARCH + DIR_SLASH))); } Lisp_Object lds_re_tail = loadsearch_re_list; --=-=-=--