[src/trunk]: src/lib/libarch Avoid defining MLIBDIR. Use ${MLIBDIR:Unone} in...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6860baf69bf2
branches:  trunk
changeset: 808922:6860baf69bf2
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 08 04:08:30 2015 +0000

description:
Avoid defining MLIBDIR.  Use ${MLIBDIR:Unone} instead.

diffstat:

 lib/libarch/Makefile            |  4 ++--
 lib/libarch/i386/Makefile.inc   |  6 ++----
 lib/libarch/x86_64/Makefile.inc |  6 ++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diffs (46 lines):

diff -r 74a85772fea7 -r 6860baf69bf2 lib/libarch/Makefile
--- a/lib/libarch/Makefile      Mon Jun 08 03:45:19 2015 +0000
+++ b/lib/libarch/Makefile      Mon Jun 08 04:08:30 2015 +0000
@@ -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 @@
 
 # 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}
diff -r 74a85772fea7 -r 6860baf69bf2 lib/libarch/i386/Makefile.inc
--- a/lib/libarch/i386/Makefile.inc     Mon Jun 08 03:45:19 2015 +0000
+++ b/lib/libarch/i386/Makefile.inc     Mon Jun 08 04:08:30 2015 +0000
@@ -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
diff -r 74a85772fea7 -r 6860baf69bf2 lib/libarch/x86_64/Makefile.inc
--- a/lib/libarch/x86_64/Makefile.inc   Mon Jun 08 03:45:19 2015 +0000
+++ b/lib/libarch/x86_64/Makefile.inc   Mon Jun 08 04:08:30 2015 +0000
@@ -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