From: Ken Brown <kbrown@cornell.edu>
Date: Sun, 5 Feb 2017 19:58:59 +0000 (-0500)
Subject: Fix build on Cygwin
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e69daacf4cf09d89ccd16d653a9c8b468f8020f5;p=emacs.git

Fix build on Cygwin

* configure.ac: Use system malloc on Cygwin.

* lisp/loadup.el: Use ".exe" suffix on Cygwin.
---

diff --git a/configure.ac b/configure.ac
index 056c8c35c57..4628cfb8576 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2204,9 +2204,7 @@ system_malloc=yes
 test "$CANNOT_DUMP" = yes ||
 case "$opsys" in
   ## darwin ld insists on the use of malloc routines in the System framework.
-  darwin | mingw32 | nacl | sol2-10) ;;
-  cygwin) hybrid_malloc=yes
-          system_malloc= ;;
+  cygwin | darwin | mingw32 | nacl | sol2-10) ;;
   *) test "$ac_cv_func_sbrk" = yes && system_malloc=$emacs_cv_sanitize_address;;
 esac
 
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 956ee790bea..6a9d4aa98b9 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -463,7 +463,7 @@ lost after dumping")))
       ;; other GNU program's build process.
       ;; (dump-emacs "emacs" "temacs")
       ;; (message "%d pure bytes used" pure-bytes-used)
-      (let ((exe (if (memq system-type '(windows-nt ms-dos)) ".exe" "")))
+      (let ((exe (if (memq system-type '(cygwin windows-nt ms-dos)) ".exe" "")))
         (copy-file (expand-file-name (concat "temacs" exe) invocation-directory)
                    (expand-file-name (concat "emacs" exe) invocation-directory)
                    t)