Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include <a.out.h> unless it's needed, and don't build 

the aout subdir if on mips.  Fixes build for mips ports.
This commit is contained in:
he 2009-08-20 19:17:19 +00:00
parent d1c69ed983
commit b233b36efa
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/ldd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2009/04/14 22:15:22 lukem Exp $
# $NetBSD: Makefile,v 1.11 2009/08/20 19:17:19 he Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
@ -8,9 +8,14 @@ PROG= ldd
SRCS= ldd.c
MAN= ldd.1
SUBDIR= aout elf32 elf64
.if (${MACHINE_ARCH} != "mips")
SUBDIR= aout
LIB_AOUTDIR!= cd ${.CURDIR}/aout && ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_AOUTDIR}/libldd_aout.a
.endif
SUBDIR+= elf32 elf64
.if (${MACHINE_ARCH} != "alpha")
LIB_ELF32DIR!= cd ${.CURDIR}/elf32 && ${PRINTOBJDIR}

5
usr.bin/ldd/ldd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ldd.c,v 1.6 2009/05/20 16:20:01 christos Exp $ */
/* $NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -62,14 +62,13 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ldd.c,v 1.6 2009/05/20 16:20:01 christos Exp $");
__RCSID("$NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $");
#endif /* not lint */
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/wait.h>
#include <a.out.h>
#include <dirent.h>
#include <err.h>
#include <errno.h>

5
usr.bin/ldd/ldd_elfxx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ldd_elfxx.c,v 1.2 2009/02/03 03:01:02 mrg Exp $ */
/* $NetBSD: ldd_elfxx.c,v 1.3 2009/08/20 19:17:19 he Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -62,14 +62,13 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ldd_elfxx.c,v 1.2 2009/02/03 03:01:02 mrg Exp $");
__RCSID("$NetBSD: ldd_elfxx.c,v 1.3 2009/08/20 19:17:19 he Exp $");
#endif /* not lint */
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/wait.h>
#include <a.out.h>
#include <dirent.h>
#include <err.h>
#include <errno.h>