From 49f81d6a531283416d3a87e46ee6696eea971b64 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sat, 19 Dec 2020 07:40:24 +0100 Subject: [PATCH] Fix Windows libgccjit library name (bug#45303). * lisp/term/w32-win.el (dynamic-library-alist): Fix Windows libgccjit library name. * src/emacs.c (syms_of_emacs): Likewise. --- lisp/term/w32-win.el | 2 +- src/emacs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 4ed2710a551..1fcfca5dfdd 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -285,7 +285,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") '(zlib "zlib1.dll" "libz-1.dll") '(lcms2 "liblcms2-2.dll") '(json "libjansson-4.dll") - '(gccjit "libgccjit.dll"))) + '(gccjit "libgccjit-0.dll"))) ;;; multi-tty support (defvar w32-initialized nil diff --git a/src/emacs.c b/src/emacs.c index afdfcade777..4b3f4c7305a 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -3084,10 +3084,10 @@ libraries; only those already known by Emacs will be loaded. */); #ifdef WINDOWSNT /* We may need to load libgccjit when dumping before term/w32-win.el defines `dynamic-library-alist`. This will fail if that variable - is empty, so add libgccjit.dll to it. */ + is empty, so add libgccjit-0.dll to it. */ if (will_dump_p ()) Vdynamic_library_alist = list1 (list2 (Qgccjit, - build_string ("libgccjit.dll"))); + build_string ("libgccjit-0.dll"))); else Vdynamic_library_alist = Qnil; #else -- 2.39.5