Prefix native compilation folders with "eln-"

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 64eb46cc38d985bb1b184a5d52ed397d3ba4fe07..0779373667dcc3abb310904cc917d1f0d34fd841 100644 (file)
--- 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 8176ba259ed059d369fb603c5a415c4d6ce95681..b9ecef07f327adf92d47898fd5aceb396f5da509 100644 (file)
--- 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