Skip to content

Commit dd09e72

Browse files
author
Ken Raeburn
committed
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.
1 parent d15719d commit dd09e72

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

lisp/loadup.el

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,6 @@ lost after dumping")))
427427
(message "Pure-hashed: %d strings, %d vectors, %d conses, %d bytecodes, %d others"
428428
strings vectors conses bytecodes others)))
429429

430-
;; Prevent build-time PATH getting stored in the binary.
431-
;; Mainly cosmetic, but helpful for Guix. (Bug#20330)
432-
;; Do this here, rather than earlier, so that the above code
433-
;; can invoke Git commands and the like.
434-
(setq exec-path nil)
435-
436430
;; Avoid error if user loads some more libraries now and make sure the
437431
;; hash-consing hash table is GC'd.
438432
(setq purify-flag nil)
@@ -445,6 +439,11 @@ lost after dumping")))
445439

446440
(if (member (car (last command-line-args)) '("dump" "bootstrap"))
447441
(progn
442+
;; Prevent build-time PATH getting stored in the binary.
443+
;; Mainly cosmetic, but helpful for Guix. (Bug#20330)
444+
;; Do this here, rather than earlier, so that the above code
445+
;; can invoke Git commands and the like.
446+
(setq exec-path nil)
448447
(message "Dumping under the name emacs")
449448
(condition-case ()
450449
(delete-file "emacs")

0 commit comments

Comments
 (0)