]> git.eshelyaron.com Git - emacs.git/commitdiff
Minor fix for unexec builds.
authorEli Zaretskii <eliz@gnu.org>
Thu, 7 Feb 2019 15:32:47 +0000 (17:32 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 7 Feb 2019 15:32:47 +0000 (17:32 +0200)
* src/emacs.c (main): Fix assertions and logic for pdump
loading in builds that can both unexec and pdump.

src/emacs.c

index 87de181725d9d5835f16558e97ec0277976ae622..3f964a16041d409974ca3ecc68d4c4abf92a769d 100644 (file)
@@ -897,10 +897,13 @@ main (int argc, char **argv)
     }
   else
     {
-      eassert (!initialized);
       eassert (!temacs);
+#ifndef HAVE_UNEXEC
+      eassert (!initialized);
+#endif
 #ifdef HAVE_PDUMPER
-      attempt_load_pdump = true;
+      if (!initialized)
+       attempt_load_pdump = true;
 #endif
     }