Module Name:    src
Committed By:   matt
Date:           Fri Jun 19 18:17:26 UTC 2015

Modified Files:
        src/compat/mips64/64: bsd.64.mk
        src/compat/mips64/o32: bsd.o32.mk

Log Message:
Prevent multi inclusion


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.10 -r1.11 src/compat/mips64/o32/bsd.o32.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.9 src/compat/mips64/64/bsd.64.mk:1.10
--- src/compat/mips64/64/bsd.64.mk:1.9	Fri Sep 23 06:44:37 2011
+++ src/compat/mips64/64/bsd.64.mk	Fri Jun 19 18:17:26 2015
@@ -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 @@ LDFLAGS+=	-mabi=64
 MKDEPFLAGS+=	-mabi=64
 
 .include "${.PARSEDIR}/../../Makefile.compat"
+.endif

Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.10 src/compat/mips64/o32/bsd.o32.mk:1.11
--- src/compat/mips64/o32/bsd.o32.mk:1.10	Thu Feb 14 09:22:18 2013
+++ src/compat/mips64/o32/bsd.o32.mk	Fri Jun 19 18:17:26 2015
@@ -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 @@ LDFLAGS+=	-mabi=32 -march=mips3
 MKDEPFLAGS+=	-mabi=32 -march=mips3
 
 .include "${.PARSEDIR}/../../Makefile.compat"
+.endif

Reply via email to