From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 3 Jul 2024 19:13:42 +0000 (+0300)
Subject: Fix MS-Windows build with native-compilation
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=20cf5abfb03722268521955b0bcd7e4eaa835ebe;p=emacs.git

Fix MS-Windows build with native-compilation

* src/w32.c (globals_of_w32): Move re-initialization of
Vlibrary_cache from here...
* src/emacs.c (main): ...to here, as it must be after load_pdump.
(Bug#71916)

(cherry picked from commit 3eaf1abbff8347c43fb0949bbe3806ab909cb54e)
---

diff --git a/src/emacs.c b/src/emacs.c
index 22b7a4f1038..c85beede992 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2168,6 +2168,10 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
   init_atimer ();
 
 #ifdef WINDOWSNT
+  /* We need to forget about libraries that were loaded during the
+     dumping process (e.g. libgccjit).  This must be done _after_
+     load_pdump.  */
+  Vlibrary_cache = Qnil;
 #ifdef HAVE_W32NOTIFY
   globals_of_w32notify ();
 #endif
diff --git a/src/w32.c b/src/w32.c
index 4986d4c6676..ab45ae8ec6b 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -10969,10 +10969,6 @@ globals_of_w32 (void)
 #endif
 
   w32_crypto_hprov = (HCRYPTPROV)0;
-
-  /* We need to forget about libraries that were loaded during the
-     dumping process (e.g. libgccjit) */
-  Vlibrary_cache = Qnil;
 }
 
 /* For make-serial-process  */