diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-08-06 02:06:43 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-08-06 02:06:43 +0000 |
| commit | c6f80f3e298ec3a1a3bb4b1e99c13aab911a05dc (patch) | |
| tree | 656a9313d41376d98243ae409e563588802df9c4 | |
| parent | 4b154cc1b3b5c73e719ab505a8fcb7ae7b5113ae (diff) | |
| download | newlib-c6f80f3e298ec3a1a3bb4b1e99c13aab911a05dc.zip newlib-c6f80f3e298ec3a1a3bb4b1e99c13aab911a05dc.tar.gz newlib-c6f80f3e298ec3a1a3bb4b1e99c13aab911a05dc.tar.bz2 | |
* Makefile.common: Don't send -nostdinc++ with g++.
| -rw-r--r-- | winsup/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/Makefile.common | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index 72ef685..ff2f4ff 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,7 @@ +2003-08-05 Christopher Faylor <cgf@redhat.com> + + * Makefile.common: Don't send -nostdinc++ with g++. + 2003-07-25 Christopher Faylor <cgf@redhat.com> * Makefile.in: Only use localhost when building mingw with distcc or diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 8e5bbda..4400b37 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -76,8 +76,9 @@ endif # Attempt to properly detect missing mingw or w32api and adjust command # line parameters appropriately -nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc -nostdinc++"} +nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc"} ifneq (,$(nostdinc)) +nostdincxx:=-nostdinc++ ifeq (,${findstring $(w32api_source),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) w32api_include:=-I$(w32api_source)/include endif @@ -129,7 +130,7 @@ ifeq (,${findstring $(gcc_libdir),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) GCC_INCLUDE:=${subst //,/,-I$(gcc_libdir)/include} endif -COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \ +COMPILE_CXX=$(CXX) $c $(nostdincxx) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \ -fno-rtti -fno-exceptions COMPILE_CC=$(CC) $c $(nostdinc) $(ALL_CFLAGS) $(GCC_INCLUDE) |