[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/raeburn-startup 711bc8e: Fix build on Cygwin
From: |
Ken Brown |
Subject: |
[Emacs-diffs] scratch/raeburn-startup 711bc8e: Fix build on Cygwin |
Date: |
Wed, 8 Feb 2017 09:32:56 -0500 (EST) |
branch: scratch/raeburn-startup
commit 711bc8ecfa67527bbaacffdc0567935e6c48b9c3
Author: Ken Brown <address@hidden>
Commit: Ken Brown <address@hidden>
Fix build on Cygwin
* configure.ac: Use system malloc on Cygwin.
* lisp/loadup.el: Use ".exe" suffix on Cygwin.
---
configure.ac | 4 +---
lisp/loadup.el | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 425e338..c1fd14d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2158,9 +2158,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 12abbb2..94d1a40 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -455,7 +455,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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] scratch/raeburn-startup 711bc8e: Fix build on Cygwin,
Ken Brown <=