From 029d147e9488a30456226dd76be4ec25aff350d6 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 30 Oct 2008 13:17:42 +0000
Subject: [PATCH] * Makefile.in: Use -static-libgcc when creating
 cygserver.exe.

---
 winsup/cygserver/ChangeLog   |  4 ++++
 winsup/cygserver/Makefile.in | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index f05f253b4..c3d4870c1 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-30  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* Makefile.in: Use -static-libgcc when creating cygserver.exe.
+
 2008-04-30  Corinna Vinschen  <corinna@vinschen.de>
 
 	* sysv_msg.cc: Add fix from upstream version 1.65.
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index a57e7b6b6..dd8ad96d6 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -11,12 +11,13 @@ SHELL:=@SHELL@
 
 srcdir:=@srcdir@
 VPATH:=@srcdir@
-prefix:=@prefix@
-exec_prefix:=@exec_prefix@
 
-bindir:=@bindir@
-sbindir:=@sbindir@
-sysconfdir:=@sysconfdir@
+DESTDIR=
+prefix:=${DESTDIR}@prefix@
+exec_prefix:=${DESTDIR}@exec_prefix@
+bindir:=${DESTDIR}@bindir@
+sbindir:=${DESTDIR}@sbindir@
+sysconfdir:=${DESTDIR}@sysconfdir@
 program_transform_name:=@program_transform_name@
 
 INSTALL:=@INSTALL@
@@ -68,7 +69,7 @@ libclean:
 fullclean: clean libclean
 
 cygserver.exe: $(CYGWIN_LIB) $(OBJS) $(CYGWIN_OBJS)
-	$(CXX) -o $@ ${wordlist 2,999,$^} -L$(cygwin_build) -lntdll
+	$(CXX) -o $@ ${wordlist 2,999,$^} -static-libgcc -L$(cygwin_build) -lntdll
 
 $(cygwin_build)/%.o: $(cygwin_source)/%.cc
 	@$(MAKE) -C $(@D) $(@F)
@@ -79,7 +80,7 @@ $(cygwin_build)/%.o: $(cygwin_source)/%.c
 Makefile: Makefile.in configure
 
 lib%.o: %.cc
-	${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -I$(updir)/cygwin -o $(@D)/${basename $(@F)}$o $<
+	${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -c -I$(updir)/cygwin -o $(@D)/${basename $(@F)}$o $<
 
 libcygserver.a: $(LIBOBJS)
 	$(AR) crus $@ $?