From: Andrea Corallo <akrl@sdf.org>
Date: Fri, 13 Mar 2020 22:16:21 +0000 (+0000)
Subject: Prefix native compilation folders with "eln-"
X-Git-Tag: emacs-28.0.90~2727^2~776
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=144e8f64b69e01a6c870574d04c92368f0056dd0;p=emacs.git

Prefix native compilation folders with "eln-"
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 64eb46cc38d..0779373667d 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2126,6 +2126,7 @@ Return the compilation unit file name."
                     (if (symbolp input)
                         (make-temp-file (concat (symbol-name input) "-"))
                       (let ((exp-file (expand-file-name input)))
+                        (cl-assert comp-native-path-postfix)
                         (concat
                          (file-name-as-directory
                           (concat
diff --git a/src/comp.c b/src/comp.c
index 8176ba259ed..b9ecef07f32 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -266,11 +266,12 @@ hash_native_abi (void)
   /* If 10 characters are usually sufficient for git I guess 16 are
      fine for us here.  */
   Vcomp_native_path_postfix =
-    concat3 (Vsystem_configuration,
-	     make_string ("-", 1),
-	     Fsubstring_no_properties (Vcomp_abi_hash,
-				       make_fixnum (0),
-				       make_fixnum (16)));
+    concat3 (make_string ("eln-", 4),
+	     Vsystem_configuration,
+	     concat2 (make_string ("-", 1),
+		      Fsubstring_no_properties (Vcomp_abi_hash,
+						make_fixnum (0),
+						make_fixnum (16))));
 }
 
 static void