* Makefile.common: Define MINGW_LDFLAGS.

	* configure.in: Reorder SUBDIRS to have mingw before cygwin.
	* configure: Regenerate from configure.in.
	* cygwin/Makefile.in: Add MINGW_LDFLAGS when linking cygrun.exe.

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index c080072..d61517a 100644 (file)
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-12  Corinna Vinschen  <corinna@vinschen.de>
+
+       * Makefile.common: Define MINGW_LDFLAGS.
+       * configure.in: Reorder SUBDIRS to have mingw before cygwin.
+       * configure: Regenerate from configure.in.
+
 2002-09-27  Christopher Faylor  <cgf@redhat.com>
 
        * Makefile.in (check): Be more defensive when creating testsuite

diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index e532fc0..12e5356 100644 (file)
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -91,6 +91,7 @@ endif
 MINGW_INCLUDES:=-I$(updir)/mingw/include $(w32api_include)
 MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES)
 MINGW_CXXFLAGS:=${filter-out $(newlib_source)/%,$(CXXFLAGS)} -mno-cygwin $(MINGW_INCLUDES)
+MINGW_LDFLAGS:=-B${mingw_build}
 
 GCC_DEFAULT_OPTIONS:=$(CFLAGS_COMMON) $(CFLAGS_CONFIG) $(INCLUDES)
 

diff --git a/winsup/configure b/winsup/configure
index 218c163..cae532b 100755 (executable)
--- a/winsup/configure
+++ b/winsup/configure
@@ -917,13 +917,13 @@ CXXFLAGS='$(CFLAGS)'
 
 
 SUBDIRS='cygwin'
+test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
 if test -d $srcdir/w32api; then
     SUBDIRS="w32api $SUBDIRS"
 else
     echo "*** missing w32api directory" 1>&2
     exit 1
 fi
-test -d $srcdir/mingw && SUBDIRS="$SUBDIRS mingw"
 
 case "$with_cross_host" in
   ""|*cygwin*)

diff --git a/winsup/configure.in b/winsup/configure.in
index 79d472b..2f29da8 100755 (executable)
--- a/winsup/configure.in
+++ b/winsup/configure.in
@@ -67,13 +67,13 @@ LIB_AC_PROG_CC
 LIB_AC_PROG_CXX
 
 SUBDIRS='cygwin'
+test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
 if test -d $srcdir/w32api; then
     SUBDIRS="w32api $SUBDIRS"
 else
     echo "*** missing w32api directory" 1>&2
     exit 1
 fi
-test -d $srcdir/mingw && SUBDIRS="$SUBDIRS mingw"
 
 case "$with_cross_host" in
   ""|*cygwin*)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f3e21c7..18ac5ab 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-12  Corinna Vinschen  <corinna@vinschen.de>
+
+       * Makefile.in: Add MINGW_LDFLAGS when linking cygrun.exe.
+
 2002-12-10  Christopher Faylor  <cgf@redhat.com>
 
        * cygthread.h (cygthread::stack_ptr): New element.

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index bddc628..e66342d 100644 (file)
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -325,7 +325,7 @@ cygrun.o: cygrun.c
 
 cygrun.exe : cygrun.o -lgcc $(w32api_lib)/libuser32.a \
             $(w32api_lib)/libshell32.a $(w32api_lib)/libkernel32.a
-       $(CC) -mno-cygwin -o $@ $^
+       $(CC) ${MINGW_LDFLAGS} -mno-cygwin -o $@ $^
 
 cygserver_transport_outside.o: cygserver_transport.cc
        $(COMPILE_CXX) -D__OUTSIDE_CYGWIN__ -o $@ $<