diff options
| author | obrien <obrien@FreeBSD.org> | 1999-10-12 20:22:38 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-10-12 20:22:38 +0000 |
| commit | 1dc4a82010bbede0fa821e0cf7b029094d091e7f (patch) | |
| tree | 3e19def438a598810c1d97f36e0ea02b1cffadd8 /gnu | |
| parent | 53f9650ab0aebf208f5645cca44d033d37e430db (diff) | |
| download | FreeBSD-src-1dc4a82010bbede0fa821e0cf7b029094d091e7f.zip FreeBSD-src-1dc4a82010bbede0fa821e0cf7b029094d091e7f.tar.gz | |
Move -I of cc_tool/ before the GCCDIR ones.
When I imported EGCS into contrib/egcs/ I failed to prune out
egcs/gcc/cp/hash.h which is generated from gxx.gperf. Thus `cc1plus' wasn't
using the hash.h we generated by cc/cc_tools/Makefile, but rather the one in
egcs/gcc/cp/.
When I imported contrib/gcc/ I did prune gcc/cp/hash.h. Unfortunately the
GCC maintainers weren't smart on their file nameing and there is also a
egcs/gcc/hash.h (name overloading does NOT work as well on the filesystem
as in C++...). Due to the -I ordering we are were then picking up gcc/hash.h
when compiling `cc1plus'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/cc/Makefile.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 858e46b..abfe55c 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -26,7 +26,6 @@ USE_EGCS_HAIFA=1 version!= sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c #version!= sed -e 's/.*\(egcs-[0-9\.]*\).*/\1/' < ${GCCDIR}/version.c -CFLAGS+= -I${GCCDIR} -I${GCCDIR}/config CFLAGS+= -DFREEBSD_NATIVE -DHAVE_CONFIG_H CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" @@ -47,6 +46,7 @@ CFLAGS+= -DCROSS_COMPILE CFLAGS+= -I${.OBJDIR}/../cc_tools .endif CFLAGS+= -I${.CURDIR}/../cc_tools +CFLAGS+= -I${GCCDIR} -I${GCCDIR}/config .if exists(${.OBJDIR}/../cc_int) LIBDESTDIR= ${.OBJDIR}/../cc_int |
