Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
matt 2015-06-08 04:08:30 +00:00
parent c40932aab7
commit 690eda7bb4
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libarch/Makefile
View File

@ -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}

6
lib/libarch/i386/Makefile.inc
View File

@ -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

6
lib/libarch/x86_64/Makefile.inc
View File

@ -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