diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2002-12-12 13:34:12 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2002-12-12 13:34:12 +0300 |
| commit | 24f7d30fa9fe63de4e13aa36f36c04afc6f7290b (patch) | |
| tree | 2f48c462c496ab6a563ee68cd39036eb0da21385 | |
| parent | a6af7dbdc3eccbfb9e68da43eb4a8d2cc59b7c4c (diff) | |
* 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.
| -rw-r--r-- | winsup/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/Makefile.common | 1 | ||||
| -rwxr-xr-x | winsup/configure | 2 | ||||
| -rwxr-xr-x | winsup/configure.in | 2 | ||||
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.in | 2 |
6 files changed, 14 insertions, 3 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index c08007285..d61517ad4 100644 --- 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 e532fc010..12e535689 100644 --- 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 218c163ea..cae532bfd 100755 --- 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 79d472b9e..2f29da8bd 100755 --- 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 f3e21c767..18ac5ab69 100644 --- 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 bddc628d7..e66342d88 100644 --- 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 $@ $< |