[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master dd09e72 2/4: Allow a CANNOT_DUMP build to use exec-
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] master dd09e72 2/4: Allow a CANNOT_DUMP build to use exec-path during bootstrap. |
Date: |
Thu, 6 Apr 2017 02:12:37 -0400 (EDT) |
branch: master
commit dd09e72ed6b1c6ba5c584e7aa32d98437d96326a
Author: Ken Raeburn <address@hidden>
Commit: Ken Raeburn <address@hidden>
Allow a CANNOT_DUMP build to use exec-path during bootstrap.
During a bootstrap, loading rmail.el invokes movemail to determine its
flavor, but call-process doesn't work if exec-path is nil.
* lisp/loadup.el: Only clear exec-path if dumping.
---
lisp/loadup.el | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 3d21be3..a3234e1 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -427,12 +427,6 @@ lost after dumping")))
(message "Pure-hashed: %d strings, %d vectors, %d conses, %d bytecodes, %d
others"
strings vectors conses bytecodes others)))
-;; Prevent build-time PATH getting stored in the binary.
-;; Mainly cosmetic, but helpful for Guix. (Bug#20330)
-;; Do this here, rather than earlier, so that the above code
-;; can invoke Git commands and the like.
-(setq exec-path nil)
-
;; Avoid error if user loads some more libraries now and make sure the
;; hash-consing hash table is GC'd.
(setq purify-flag nil)
@@ -445,6 +439,11 @@ lost after dumping")))
(if (member (car (last command-line-args)) '("dump" "bootstrap"))
(progn
+ ;; Prevent build-time PATH getting stored in the binary.
+ ;; Mainly cosmetic, but helpful for Guix. (Bug#20330)
+ ;; Do this here, rather than earlier, so that the above code
+ ;; can invoke Git commands and the like.
+ (setq exec-path nil)
(message "Dumping under the name emacs")
(condition-case ()
(delete-file "emacs")