* 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.
This commit is contained in:
Corinna Vinschen 2002-12-12 10:34:12 +00:00
parent a6af7dbdc3
commit 24f7d30fa9
6 changed files with 14 additions and 3 deletions

View File

@ -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> 2002-09-27 Christopher Faylor <cgf@redhat.com>
* Makefile.in (check): Be more defensive when creating testsuite * Makefile.in (check): Be more defensive when creating testsuite

View File

@ -91,6 +91,7 @@ endif
MINGW_INCLUDES:=-I$(updir)/mingw/include $(w32api_include) MINGW_INCLUDES:=-I$(updir)/mingw/include $(w32api_include)
MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES) MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES)
MINGW_CXXFLAGS:=${filter-out $(newlib_source)/%,$(CXXFLAGS)} -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) GCC_DEFAULT_OPTIONS:=$(CFLAGS_COMMON) $(CFLAGS_CONFIG) $(INCLUDES)

2
winsup/configure vendored
View File

@ -917,13 +917,13 @@ CXXFLAGS='$(CFLAGS)'
SUBDIRS='cygwin' SUBDIRS='cygwin'
test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
if test -d $srcdir/w32api; then if test -d $srcdir/w32api; then
SUBDIRS="w32api $SUBDIRS" SUBDIRS="w32api $SUBDIRS"
else else
echo "*** missing w32api directory" 1>&2 echo "*** missing w32api directory" 1>&2
exit 1 exit 1
fi fi
test -d $srcdir/mingw && SUBDIRS="$SUBDIRS mingw"
case "$with_cross_host" in case "$with_cross_host" in
""|*cygwin*) ""|*cygwin*)

View File

@ -67,13 +67,13 @@ LIB_AC_PROG_CC
LIB_AC_PROG_CXX LIB_AC_PROG_CXX
SUBDIRS='cygwin' SUBDIRS='cygwin'
test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
if test -d $srcdir/w32api; then if test -d $srcdir/w32api; then
SUBDIRS="w32api $SUBDIRS" SUBDIRS="w32api $SUBDIRS"
else else
echo "*** missing w32api directory" 1>&2 echo "*** missing w32api directory" 1>&2
exit 1 exit 1
fi fi
test -d $srcdir/mingw && SUBDIRS="$SUBDIRS mingw"
case "$with_cross_host" in case "$with_cross_host" in
""|*cygwin*) ""|*cygwin*)

View File

@ -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> 2002-12-10 Christopher Faylor <cgf@redhat.com>
* cygthread.h (cygthread::stack_ptr): New element. * cygthread.h (cygthread::stack_ptr): New element.

View File

@ -325,7 +325,7 @@ cygrun.o: cygrun.c
cygrun.exe : cygrun.o -lgcc $(w32api_lib)/libuser32.a \ cygrun.exe : cygrun.o -lgcc $(w32api_lib)/libuser32.a \
$(w32api_lib)/libshell32.a $(w32api_lib)/libkernel32.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 cygserver_transport_outside.o: cygserver_transport.cc
$(COMPILE_CXX) -D__OUTSIDE_CYGWIN__ -o $@ $< $(COMPILE_CXX) -D__OUTSIDE_CYGWIN__ -o $@ $<