summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2013-04-27 06:24:22 +0000
committermatt <matt@NetBSD.org>2013-04-27 06:24:22 +0000
commit0cc319d29bdbc4ccca3c6e59f2823d897331ffc3 (patch)
treeb8309691666b083ce1b2266a0c457e6a1340fbec /lib
parent8e9eb28beda64d8a9ac658fb44fa7e2acc13ffce (diff)
Changes for MKCOMPAT for earm.
Diffstat (limited to 'lib')
-rw-r--r--lib/libarch/Makefile4
-rw-r--r--lib/libexecinfo/Makefile5
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/libarch/Makefile b/lib/libarch/Makefile
index 5026b43be4b..2dc93f42d9f 100644
--- a/lib/libarch/Makefile
+++ b/lib/libarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/07/28 20:30:07 dyoung Exp $
+# $NetBSD: Makefile,v 1.25 2013/04/27 06:24:22 matt Exp $
# These should always be a MACHINE_CPU value
ARCHDIRS= alpha arm i386 m68k sparc x86_64
@@ -14,7 +14,7 @@ CLEANFILES+= ${ASM} ${POBJS}
# Build the library if SRCS is now defined ...
.if defined(SRCS)
-.if defined(MLIBDIR) && ${MLIBDIR} != "none"
+.if defined(MLIBDIR) && ${MLIBDIR} != "none" && ${MACHINE_CPU} != "arm"
LIB= ${MLIBDIR}
.else
LIB= ${MACHINE_CPU}
diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
index ca977c6c30c..168f654473b 100644
--- a/lib/libexecinfo/Makefile
+++ b/lib/libexecinfo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/04/25 14:48:09 matt Exp $
+# $NetBSD: Makefile,v 1.3 2013/04/27 06:24:23 matt Exp $
.include <bsd.own.mk>
+LIBEXECINFO_MACHINE_ARCH?= ${MACHINE_ARCH}
USE_UNWIND=yes
WARNS?=4
INCSDIR=/usr/include
@@ -19,7 +20,7 @@ MAN= backtrace.3
.if ${USE_UNWIND} == "yes"
SRCS+=unwind.c
-.if !empty(MACHINE_ARCH:Mearm)
+.if !empty(LIBEXECINFO_MACHINE_ARCH:Mearm)
SRCS+=unwind_arm_ehabi_stub.c
.endif
.else