diff options
| author | Liāu, Kiong-Gē 廖宮毅 | 2020-12-22 20:02:50 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2020-12-22 21:06:16 +0100 |
| commit | 433ae7b0a5cedbcd7b0a1daf12846e38f00fd111 (patch) | |
| tree | 70509a30988b79f66ca5cad8b6932dbcd333b0e7 | |
| parent | 9676e4d7766cea647a4e2b9e27fad97479b418de (diff) | |
| download | emacs-433ae7b0a5cedbcd7b0a1daf12846e38f00fd111.tar.gz emacs-433ae7b0a5cedbcd7b0a1daf12846e38f00fd111.zip | |
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
| -rw-r--r-- | nt/mingw-cfg.site | 4 | ||||
| -rw-r--r-- | src/comp.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 | |||
| 156 | # We don't want to build Emacs so it depends on bcrypt.dll, since then | 156 | # We don't want to build Emacs so it depends on bcrypt.dll, since then |
| 157 | # it will refuse to start on systems where that DLL is absent. | 157 | # it will refuse to start on systems where that DLL is absent. |
| 158 | gl_cv_lib_assume_bcrypt=no | 158 | gl_cv_lib_assume_bcrypt=no |
| 159 | # Force 'ac_cv_func_strsignal' to no as mingw64 libgccjit exports this | ||
| 160 | # symbol erroneously | ||
| 161 | # <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45303#83>. | ||
| 162 | 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) | |||
| 4534 | concat2 (XCAR (dir_tail), | 4534 | concat2 (XCAR (dir_tail), |
| 4535 | Vcomp_native_version_dir), | 4535 | Vcomp_native_version_dir), |
| 4536 | Qt, build_string ("\\.eln\\.old\\'"), Qnil, | 4536 | Qt, build_string ("\\.eln\\.old\\'"), Qnil, |
| 4537 | Qt, Qnil, return_nil); | 4537 | Qnil, Qt, return_nil); |
| 4538 | FOR_EACH_TAIL (files_in_dir) | 4538 | FOR_EACH_TAIL (files_in_dir) |
| 4539 | Fdelete_file (XCAR (files_in_dir), Qnil); | 4539 | Fdelete_file (XCAR (files_in_dir), Qnil); |
| 4540 | } | 4540 | } |