diff options
| author | ache <ache@FreeBSD.org> | 2004-03-05 16:12:31 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2004-03-05 16:12:31 +0000 |
| commit | f1c3e2bb1611609ffbe3f1d9b75a6c8f8d6ed4f8 (patch) | |
| tree | 00d780e29d57db0395516d329c1e798c239dd6cf /gnu/usr.bin | |
| parent | c66fcd0b620d1ebbce5bc7234b11aba42f99889b (diff) | |
| download | FreeBSD-src-f1c3e2bb1611609ffbe3f1d9b75a6c8f8d6ed4f8.zip FreeBSD-src-f1c3e2bb1611609ffbe3f1d9b75a6c8f8d6ed4f8.tar.gz | |
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.
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/binutils/Makefile.inc0 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/gasp/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/gdb/Makefile | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0 index b778b09..4d3d613 100644 --- a/gnu/usr.bin/binutils/Makefile.inc0 +++ b/gnu/usr.bin/binutils/Makefile.inc0 @@ -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}) diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile index 817aa43..237474a 100644 --- a/gnu/usr.bin/binutils/gasp/Makefile +++ b/gnu/usr.bin/binutils/gasp/Makefile @@ -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} diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile index d2e0bdd..cadd3b2 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile +++ b/gnu/usr.bin/binutils/gdb/Makefile @@ -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= |
