* Makefile.in: Make CXXFLAGS consistent with cygwin.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 5939a1f..2030f17 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 18 12:45:10 2000  Christopher Faylor <cgf@cygnus.com>
+
+       * Makefile.in: Make CXXFLAGS consistent with cygwin.
+
 Wed Mar 15 00:53:58 2000  Christopher Faylor <cgf@cygnus.com>
 
        * Makefile.in: Use MINGW_CXXFLAGS when compiling strace.

diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index b172024..c5515ca 100644 (file)
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -29,14 +29,14 @@ CC:=@CC@
 CC_FOR_TARGET:=$(CC)
 
 CFLAGS:=@CFLAGS@
-CXXFLAGS:=@CXXFLAGS@
+CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -nostdinc++ -fno-rtti
 
 include $(srcdir)/../Makefile.common
 
 MINGW_INCLUDES:=-I$(updir)/mingw/include
 
-MINGW_CXXFLAGS:=$(CXXFLAGS) -mno-cygwin $(CXXFLAGS) $(MINGW_INCLUDES)
-MINGW_CFLAGS:=$(CFLAGS) -mno-cygwin $(CFLAGS) $(MINGW_INCLUDES)
+MINGW_CXXFLAGS:=$(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES)
+MINGW_CFLAGS:=$(CFLAGS) -mno-cygwin $(MINGW_INCLUDES)
 
 libcygwin:=$(cygwin_build)/libcygwin.a
 libuser32:=$(w32api_lib)/libuser32.a
@@ -52,6 +52,7 @@ ALL_LDLIBS:=${patsubst $(w32api_lib)/lib%.a,-l%,\
 
 MINGW_LIB:=$(mingw_build)/libmingw32.a
 MINGW_LDLIBS:=$(ALL_LDLIBS) $(MINGW_LIB)
+MINGW_DEP_LDLIBS:=${ALL_DEP_LDLIBS} ${MINGW_LIB}
 ALL_LDFLAGS:=-B$(newlib_build)/libc/ -B$(newlib_build)/libm/ -B$(w32api_lib)/ \
             $(LDFLAGS) $(ALL_LDLIBS)
 MINGW_LDFLAGS:=$(ALL_LDFLAGS) $(MINGW_LIB)
@@ -70,7 +71,7 @@ WINSUP_DEPS:=$(cygwin_source)/winsup.h
 
 all: Makefile $(PROGS)
 
-strace.exe: strace.cc mingw_getopt.o $(MINGW_LDLIBS)
+strace.exe: strace.cc mingw_getopt.o $(MINGW_DEP_LDLIBS)
 ifdef VERBOSE
        $(CC) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
 else