Module Name: src
Committed By: matt
Date: Mon Jun 8 04:08:30 UTC 2015
Modified Files:
src/lib/libarch: Makefile
src/lib/libarch/i386: Makefile.inc
src/lib/libarch/x86_64: Makefile.inc
Log Message:
Avoid defining MLIBDIR. Use ${MLIBDIR:Unone} instead.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libarch/Makefile
cvs rdiff -u -r1.14 -r1.15 src/lib/libarch/i386/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libarch/x86_64/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/lib/libarch/Makefile
diff -u src/lib/libarch/Makefile:1.28 src/lib/libarch/Makefile:1.29
--- src/lib/libarch/Makefile:1.28 Sun Aug 10 23:25:49 2014
+++ src/lib/libarch/Makefile Mon Jun 8 04:08:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/08/10 23:25:49 matt Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/08 04:08:30 matt Exp $
.include <bsd.own.mk>
@@ -18,7 +18,7 @@ LIBC_MACHINE_CPU?= ${MACHINE_CPU}
# Build the library if SRCS is now defined ...
.if defined(SRCS)
-.if defined(MLIBDIR) && ${MLIBDIR} != "none" && ${LIBC_MACHINE_CPU} != "arm"
+.if defined(MLIBDIR) && ${LIBC_MACHINE_CPU} != "arm"
LIB= ${MLIBDIR}
.else
LIB= ${LIBC_MACHINE_CPU}
Index: src/lib/libarch/i386/Makefile.inc
diff -u src/lib/libarch/i386/Makefile.inc:1.14 src/lib/libarch/i386/Makefile.inc:1.15
--- src/lib/libarch/i386/Makefile.inc:1.14 Sun Dec 13 08:25:20 2009
+++ src/lib/libarch/i386/Makefile.inc Mon Jun 8 04:08:30 2015
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.14 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.15 2015/06/08 04:08:30 matt Exp $
-MLIBDIR?= none
-
-.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR} == "i386")
+.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR:Unone} == "i386")
SRCS+= i386_get_ldt.c i386_set_ldt.c \
i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
i386_vm86.c i386_pmc.c i386_mtrr.c
Index: src/lib/libarch/x86_64/Makefile.inc
diff -u src/lib/libarch/x86_64/Makefile.inc:1.4 src/lib/libarch/x86_64/Makefile.inc:1.5
--- src/lib/libarch/x86_64/Makefile.inc:1.4 Sun Dec 13 08:25:20 2009
+++ src/lib/libarch/x86_64/Makefile.inc Mon Jun 8 04:08:30 2015
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2015/06/08 04:08:30 matt Exp $
-MLIBDIR?= none
-
-.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR} != "i386")
+.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386")
SRCS+= x86_64_mtrr.c x86_64_iopl.c
.endif
