aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-02-07 17:32:47 +0200
committerEli Zaretskii2019-02-07 17:32:47 +0200
commitdbb1a8bc1a285c7ed8817bac533ed4a096c391ac (patch)
treec45debafcf1d81b22dc9efbf49550af7c524cc6c /src
parent0ceee95f854ed9894b7077a826b00e6220932555 (diff)
downloademacs-dbb1a8bc1a285c7ed8817bac533ed4a096c391ac.tar.gz
emacs-dbb1a8bc1a285c7ed8817bac533ed4a096c391ac.zip
Minor fix for unexec builds.
* src/emacs.c (main): Fix assertions and logic for pdump loading in builds that can both unexec and pdump.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 87de181725d..3f964a16041 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -897,10 +897,13 @@ main (int argc, char **argv)
897 } 897 }
898 else 898 else
899 { 899 {
900 eassert (!initialized);
901 eassert (!temacs); 900 eassert (!temacs);
901#ifndef HAVE_UNEXEC
902 eassert (!initialized);
903#endif
902#ifdef HAVE_PDUMPER 904#ifdef HAVE_PDUMPER
903 attempt_load_pdump = true; 905 if (!initialized)
906 attempt_load_pdump = true;
904#endif 907#endif
905 } 908 }
906 909