Back out attempt to bypass contrib's getopt.h on the way,

it makes cross-build fail.
Prefer invisible incorrect -current build to visible failure.
This commit is contained in:
Andrey A. Chernov 2004-03-05 16:12:31 +00:00
parent d562095ead
commit 7e433f006b
3 changed files with 2 additions and 8 deletions

View File

@ -24,8 +24,6 @@ CFLAGS+= -I${.CURDIR}/${TARGET_ARCH}
.endif
CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${TARGET_ARCH}
# to pick right getopt.h
CFLAGS+= -I${DESTDIR}/usr/include
CFLAGS+= -I${SRCDIR}/include
.if exists(${.CURDIR}/${TARGET_ARCH})

View File

@ -1,8 +1,5 @@
# $FreeBSD$
# must be before -I${DESTDIR}/usr/include
CFLAGS+= -I${DESTDIR}/usr/include/gnu
.include "../Makefile.inc0"
.PATH: ${SRCDIR}/gas
@ -13,6 +10,7 @@ WARNS?= 2
CFLAGS+= -DBFD_ASSEMBLER
CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd -I${.CURDIR}/../as
CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${DESTDIR}/usr/include/gnu
CFLAGS+= -I${SRCDIR} -I${SRCDIR}/gas -I${SRCDIR}/gas/config
DPADD= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}

View File

@ -1,9 +1,6 @@
# ex:ts=8
# $FreeBSD$
# must be before -I${DESTDIR}/usr/include
CFLAGS+= -I${DESTDIR}/usr/include/gnu
.include "../Makefile.inc0"
GDBDIR= ${.CURDIR}/../../../../contrib/gdb
@ -61,6 +58,7 @@ CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch
CFLAGS+= -I${.CURDIR}/${TARGET_ARCH}
CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd
CFLAGS+= -I${GDBDIR}/gdb -I${GDBDIR}/gdb/config
CFLAGS+= -I${DESTDIR}/usr/include/gnu
CFLAGS+= -I$(.CURDIR)
YFLAGS=