[src/trunk]: src/external/gpl3/gcc/dist/gcc avoid passing -I$DESTDIR/usr/incl...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d01266065aaf
branches:  trunk
changeset: 766868:d01266065aaf
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 03 14:09:57 2011 +0000

description:
avoid passing -I$DESTDIR/usr/include to the $HOST_CC.

diffstat:

 external/gpl3/gcc/dist/gcc/Makefile.in |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r b8ba44562984 -r d01266065aaf external/gpl3/gcc/dist/gcc/Makefile.in
--- a/external/gpl3/gcc/dist/gcc/Makefile.in    Sun Jul 03 13:43:23 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/Makefile.in    Sun Jul 03 14:09:57 2011 +0000
@@ -767,7 +767,7 @@
 
 # Native linker and preprocessor flags.  For x-fragment overrides.
 BUILD_LDFLAGS=@BUILD_LDFLAGS@
-BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
+BUILD_CPPFLAGS=$(BALL_CPPFLAGS)
 
 # Actual name to use when installing a native compiler.
 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
@@ -982,6 +982,7 @@
 # puts -I options in CPPFLAGS, our include files in the srcdir will always
 # win against random include files in /usr/include.
 ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS)
+BALL_CPPFLAGS = $(BINCLUDES) $(CPPFLAGS)
 
 # This is the variable to use when using $(COMPILER).
 ifneq ($(ENABLE_BUILD_WITH_CXX),yes)
@@ -1043,6 +1044,10 @@
           -I$(srcdir)/../include @INCINTL@ \
           $(CPPINC) $(GMPINC) $(DECNUMINC) \
           $(PPLINC) $(CLOOGINC) $(LIBELFINC)
+BINCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
+          -I$(srcdir)/../include @INCINTL@ \
+          $(CPPINC) $(DECNUMINC) \
+          $(PPLINC) $(CLOOGINC) $(LIBELFINC)
 
 .c.o:
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $< $(OUTPUT_OPTION)