From: Liāu, Kiong-Gē 廖宮毅 <gongyi.liao@gmail.com>
Date: Tue, 22 Dec 2020 19:02:50 +0000 (+0100)
Subject: Fix --with-nativecomp Windows build (bug#45303)
X-Git-Tag: emacs-28.0.90~2727^2~235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=433ae7b0a5cedbcd7b0a1daf12846e38f00fd111;p=emacs.git

Fix --with-nativecomp Windows build (bug#45303)

Liāu, Kiong-Gē 廖宮毅 <gongyi.liao@gmail.com>

	* src/comp.c (eln_load_path_final_clean_up): Fix argument order.
	* nt/mingw-cfg.site (ac_cv_func_strsignal): Force
	`ac_cv_func_strsignal' to no.

Copyright-paperwork-exempt: yes
---

diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site
index 4a77cc20b4e..a2c93996970 100644
--- a/nt/mingw-cfg.site
+++ b/nt/mingw-cfg.site
@@ -156,3 +156,7 @@ gl_cv_func_copy_file_range=yes
 # We don't want to build Emacs so it depends on bcrypt.dll, since then
 # it will refuse to start on systems where that DLL is absent.
 gl_cv_lib_assume_bcrypt=no
+# Force 'ac_cv_func_strsignal' to no as mingw64 libgccjit exports this
+# symbol erroneously
+# <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45303#83>.
+ac_cv_func_strsignal=no
diff --git a/src/comp.c b/src/comp.c
index 70f61bfbe1d..166c75bea0d 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4534,7 +4534,7 @@ eln_load_path_final_clean_up (void)
 				   concat2 (XCAR (dir_tail),
 					    Vcomp_native_version_dir),
 				   Qt, build_string ("\\.eln\\.old\\'"), Qnil,
-				   Qt, Qnil, return_nil);
+				   Qnil, Qt, return_nil);
       FOR_EACH_TAIL (files_in_dir)
 	Fdelete_file (XCAR (files_in_dir), Qnil);
     }