Module Name: src
Committed By: snj
Date: Mon Jun 29 17:20:04 UTC 2015
Modified Files:
src/usr.bin/ldd [netbsd-7]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by roy in ticket #853):
usr.bin/ldd/Makefile.inc: revision 1.6
Do not set MLIBDIR if MKCOMPAT=no
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/usr.bin/ldd/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/Makefile.inc
diff -u src/usr.bin/ldd/Makefile.inc:1.5 src/usr.bin/ldd/Makefile.inc:1.5.8.1
--- src/usr.bin/ldd/Makefile.inc:1.5 Wed Mar 20 15:18:42 2013
+++ src/usr.bin/ldd/Makefile.inc Mon Jun 29 17:20:04 2015
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.5 2013/03/20 15:18:42 macallan Exp $
+# $NetBSD: Makefile.inc,v 1.5.8.1 2015/06/29 17:20:04 snj Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
+.if ${MKCOMPAT} != "no"
+
.if ${MACHINE_ARCH} == "sparc64"
MLIBDIR= sparc
.endif
@@ -21,6 +23,8 @@ COMPAT_MLIBDIR= o32
CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32
.endif
+.endif # MKCOMPAT
+
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"
.endif
