From 5556c6209fbbc743eae3bf99b19cc8b899684d5f Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 4 Feb 2008 12:02:26 +0000
Subject: [PATCH] 	* Makefile.in: Don't link strfuncs.o from the Cygwin
 build dir. 	Build it again with __OUTSIDE_CYGWIN__ defined.

---
 winsup/cygserver/ChangeLog   | 5 +++++
 winsup/cygserver/Makefile.in | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 1aea84407..fddfa4b8f 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-03  Brian Dessent  <brian@dessent.net>
+
+	* Makefile.in: Don't link strfuncs.o from the Cygwin build dir.
+	Build it again with __OUTSIDE_CYGWIN__ defined.
+
 2007-11-05  Corinna Vinschen  <corinna@vinschen.de>
 
 	* bsd_helper.cc (tunable_params): Add kern.ipc.shm_allow_removed as
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index 0671432ec..cea7bcd52 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -43,7 +43,7 @@ OBJS:=	cygserver.o client.o process.o msg.o sem.o shm.o threaded_queue.o \
 	sysv_msg.o sysv_sem.o sysv_shm.o
 LIBOBJS:=${patsubst %.o,lib%.o,$(OBJS)}
 
-CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/strfuncs.o $(cygwin_build)/version.o
+CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o
 
 CYGWIN_LIB:=$(cygwin_build)/libcygwin.a
 
@@ -67,7 +67,7 @@ libclean:
 
 fullclean: clean libclean
 
-cygserver.exe: $(CYGWIN_LIB) $(OBJS) $(CYGWIN_OBJS)
+cygserver.exe: $(CYGWIN_LIB) $(OBJS) $(CYGWIN_OBJS) strfuncs.o
 	$(CXX) -o $@ ${wordlist 2,999,$^} -L$(cygwin_build) -lntdll
 
 $(cygwin_build)/%.o: $(cygwin_source)/%.cc
@@ -81,6 +81,9 @@ Makefile: Makefile.in configure
 lib%.o: %.cc
 	${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -I$(updir)/cygwin -o $(@D)/${basename $(@F)}$o $<
 
+strfuncs.o: $(cygwin_source)/strfuncs.cc
+	$(COMPILE_CXX) -I$(updir)/cygwin -o $(@D)/$(*F)$o $<
+
 libcygserver.a: $(LIBOBJS)
 	$(AR) crus $@ $?