summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.cross4
-rw-r--r--libexec/ld.so/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.cross b/Makefile.cross
index 3567a28ca73..e696907f3a3 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.74 2014/10/09 03:40:12 lteo Exp $
+# $OpenBSD: Makefile.cross,v 1.75 2015/02/08 00:15:22 uebayasi Exp $
cross-tools: cross-includes cross-binutils cross-gcc cross-lib
cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -114,6 +114,8 @@ NO_CROSS+=microcode
NO_CROSS+=groff binutils binutils-2.17 perl texinfo gcc cvs
NO_CROSS+=nsd
NO_CROSS+=sqlite3
+NO_CROSS+=bind
+NO_CROSS+=unbound
cross-dirs: ${CROSSDIRS}
cross-obj: ${CROSSOBJ}
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile
index 4de73430eb6..223e2e62e9d 100644
--- a/libexec/ld.so/Makefile
+++ b/libexec/ld.so/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2014/12/22 19:14:59 deraadt Exp $
+# $OpenBSD: Makefile,v 1.55 2015/02/08 00:15:22 uebayasi Exp $
SUBDIR=ldconfig ldd
MAN= ld.so.1
@@ -47,7 +47,9 @@ $(test_prog):
$(PROG): $(test_prog)
$(LD) -x -e _dl_start $(ELF_LDFLAGS) -o $(candidate) $(OBJS) $(LDADD)
+.ifndef CROSSDIR
ulimit -c 0; [ "`${.OBJDIR}/$(test_prog) ok`" = ok ]
+.endif
cp $(candidate) $@
.endif