01/06: build: emacs-utils: Adjust ‘emacs-compile-directory’ for Emacs 29.

[guix-commits]

lilyp pushed a commit to branch emacs-team
in repository guix.

commit 4a00fa9beaa671d6eb354e5e12826ae261e7e57b
Author: Hilton Chain <hako@ultrarare.space>
AuthorDate: Sat Sep 2 00:15:29 2023 +0800

    build: emacs-utils: Adjust ‘emacs-compile-directory’ for Emacs 29.
    
    * guix/build/emacs-utils.scm (emacs-compile-directory): After native
    compilation, write the bytecode file with ‘comp-write-bytecode-file’.
    
    Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 guix/build/emacs-utils.scm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm
index ac3dac57d1..8e12b5b6d4 100644
--- a/guix/build/emacs-utils.scm
+++ b/guix/build/emacs-utils.scm
@@ -139,7 +139,7 @@ If native code is not supported, compile to bytecode 
instead."
            (files (directory-files-recursively ,dir "\\.el$")))
        (mapc
         (lambda (file)
-          (let (byte-to-native-output-file
+          (let (byte-to-native-output-buffer-file
                 ;; First entry is the eln-cache of the homeless shelter,
                 ;; second entry is the install directory.
                 (eln-dir (and (native-comp-available-p)
@@ -148,13 +148,9 @@ If native code is not supported, compile to bytecode 
instead."
                 (native-compile file
                                 (comp-el-to-eln-filename file eln-dir))
                 (byte-compile-file file))
-            ;; Sadly, we can't use pcase because quasiquote works different in
-            ;; Emacs.  See `batch-byte+native-compile' in comp.el for the
-            ;; actual shape of byte-to-native-output-file.
-            (unless (null byte-to-native-output-file)
-              (rename-file (car byte-to-native-output-file)
-                           (cdr byte-to-native-output-file)
-                           t))))
+            ;; After native compilation, write the bytecode file.
+            (unless (null byte-to-native-output-buffer-file)
+              (comp-write-bytecode-file nil))))
        files))
     #:dynamic? #t))