* Makefile.common: Don't send -nostdinc++ with g++.

This commit is contained in:
Christopher Faylor 2003-08-06 02:06:43 +00:00
parent 4b154cc1b3
commit c6f80f3e29
2 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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)