[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/07: build-system: emacs: Compute relative file names.
From: |
guix-commits |
Subject: |
05/07: build-system: emacs: Compute relative file names. |
Date: |
Fri, 1 Mar 2024 14:38:36 -0500 (EST) |
lilyp pushed a commit to branch emacs-team
in repository guix.
commit 56a7c1308a1f1601299b8c7706fb4d00d5c185d0
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Tue Feb 13 19:30:50 2024 +0100
build-system: emacs: Compute relative file names.
With the previous commit, relative file names are expanded relative to
ELN_DIR -- more or less. To make use of this in emacs-build-system, we must
also pass relative file names.
* guix/build/emacs-build-system.scm (emacs-compile-directory): Compute the
relative file names of the files to compile.
Change-Id: I8983f80fb0fe1573e46748222403ba8873f1599f
---
guix/build/emacs-utils.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm
index 8e12b5b6d4..eca42bf305 100644
--- a/guix/build/emacs-utils.scm
+++ b/guix/build/emacs-utils.scm
@@ -146,7 +146,9 @@ If native code is not supported, compile to bytecode
instead."
(cadr native-comp-eln-load-path))))
(if byte+native-compile
(native-compile file
- (comp-el-to-eln-filename file eln-dir))
+ (comp-el-to-eln-filename
+ (file-relative-name file ,dir)
+ eln-dir))
(byte-compile-file file))
;; After native compilation, write the bytecode file.
(unless (null byte-to-native-output-buffer-file)
- branch emacs-team updated (aae61f54ff -> 9160cccd76), guix-commits, 2024/03/01
- 01/07: gnu: emacs: Build trampolines., guix-commits, 2024/03/01
- 02/07: gnu: emacs: Don't hash file names in native compilation., guix-commits, 2024/03/01
- 06/07: gnu: emacs-org: Fix native builds., guix-commits, 2024/03/01
- 07/07: gnu: emacs-magit: Fix native builds., guix-commits, 2024/03/01
- 05/07: build-system: emacs: Compute relative file names.,
guix-commits <=
- 03/07: gnu: emacs: Check integrity of native-compiled files., guix-commits, 2024/03/01
- 04/07: gnu: emacs: Disable jit compilation., guix-commits, 2024/03/01