summaryrefslogtreecommitdiffstats
path: root/usr.sbin/rndc
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2011-07-16 11:20:54 +0000
committerdougb <dougb@FreeBSD.org>2011-07-16 11:20:54 +0000
commit264979c9d1dc6f5cacff8dc9ec89d787dfa80612 (patch)
tree3215a62144f0dff34bb0f666e3526778f7f62937 /usr.sbin/rndc
parentf4894c219c9f0fee1e1d5d793748161bba7d4111 (diff)
downloadFreeBSD-src-264979c9d1dc6f5cacff8dc9ec89d787dfa80612.zip
FreeBSD-src-264979c9d1dc6f5cacff8dc9ec89d787dfa80612.tar.gz
bmake and other updates necessary for the BIND 9.8.x upgrade.
This includes a structural change regarding atomic ops. Previously they were enabled on all platforms unless we had knowledge that they did not work. However both work performed by marius@ on sparc64 and the fact that the 9.8.x branch is fussier in this area has demonstrated that this is not a safe approach. So I've modified a patch provided by marius to enable them for i386, amd64, and ia64 only.
Diffstat (limited to 'usr.sbin/rndc')
-rw-r--r--usr.sbin/rndc/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile
index 9cd356f..66d8452 100644
--- a/usr.sbin/rndc/Makefile
+++ b/usr.sbin/rndc/Makefile
@@ -9,13 +9,11 @@ SRCDIR= ${BIND_DIR}/bin/rndc
PROG= rndc
-.PATH: ${SRCDIR}/unix
-SRCS+= os.c
-
.PATH: ${SRCDIR}
SRCS+= rndc.c util.c
-CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
+CFLAGS+= -I${SRCDIR}/include -I${LIB_BIND_DIR}
+CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
WARNS?= 3
OpenPOWER on IntegriCloud