2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d89f51001a..789f7dc8c56 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-16  Ken Brown  <kbrown@cornell.edu>  (tiny change)
+
+        * s/cygwin.h: Avoid linking against static libgcc.
+
 2010-04-15  Juri Linkov  <juri@jurta.org>
 
         * window.c: Add Qscroll_command.
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 9ca5c67ce37..9f4669d6e3f 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -132,6 +132,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
 #define G_SLICE_ALWAYS_MALLOC
 
+/* Don't link against static libgcc */
+#define LIB_GCC
+
+/* Don't list system libs on link command line */
+#define LIB_STANDARD
+#define LIB_MATH
+#define LIBS_DEBUG
+
 /* the end */
 
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b