Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/compat/mips64 Prevent multi inclusion



details:   https://anonhg.NetBSD.org/src/rev/0a4088a68ace
branches:  trunk
changeset: 809105:0a4088a68ace
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 19 18:17:26 2015 +0000

description:
Prevent multi inclusion

diffstat:

 compat/mips64/64/bsd.64.mk   |  4 +++-
 compat/mips64/o32/bsd.o32.mk |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r f3c02cc5cc66 -r 0a4088a68ace compat/mips64/64/bsd.64.mk
--- a/compat/mips64/64/bsd.64.mk        Fri Jun 19 18:16:06 2015 +0000
+++ b/compat/mips64/64/bsd.64.mk        Fri Jun 19 18:17:26 2015 +0000
@@ -1,5 +1,6 @@
-#      $NetBSD: bsd.64.mk,v 1.9 2011/09/23 06:44:37 mrg Exp $
+#      $NetBSD: bsd.64.mk,v 1.10 2015/06/19 18:17:26 matt Exp $
 
+.ifndef MLIBDIR
 .if ${MACHINE_ARCH} == "mips64eb"
 LD+=           -m elf64btsmip
 .else
@@ -19,3 +20,4 @@
 MKDEPFLAGS+=   -mabi=64
 
 .include "${.PARSEDIR}/../../Makefile.compat"
+.endif
diff -r f3c02cc5cc66 -r 0a4088a68ace compat/mips64/o32/bsd.o32.mk
--- a/compat/mips64/o32/bsd.o32.mk      Fri Jun 19 18:16:06 2015 +0000
+++ b/compat/mips64/o32/bsd.o32.mk      Fri Jun 19 18:17:26 2015 +0000
@@ -1,5 +1,6 @@
-#      $NetBSD: bsd.o32.mk,v 1.10 2013/02/14 09:22:18 matt Exp $
+#      $NetBSD: bsd.o32.mk,v 1.11 2015/06/19 18:17:26 matt Exp $
 
+.ifndef MLIBDIR
 .if ${MACHINE_ARCH} == "mips64eb"
 LD+=           -m elf32btsmip
 .else
@@ -17,3 +18,4 @@
 MKDEPFLAGS+=   -mabi=32 -march=mips3
 
 .include "${.PARSEDIR}/../../Makefile.compat"
+.endif



Home | Main Index | Thread Index | Old Index