diff options
| author | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2015-02-08 00:15:23 +0000 |
|---|---|---|
| committer | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2015-02-08 00:15:23 +0000 |
| commit | 50bd1dd5ac254d9149ead693ebb2d7894cf31a45 (patch) | |
| tree | 03d86b0a34a83bf55649e68c91d2569a38c5ec27 | |
| parent | 515427bb6debe1510e814d7777675bca127d4558 (diff) | |
Fix cross-build. OK jsing@ miod@ guenther@ deraadt@
| -rw-r--r-- | Makefile.cross | 4 | ||||
| -rw-r--r-- | libexec/ld.so/Makefile | 4 |
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 |