Module Name: src
Committed By: matt
Date: Sat Apr 27 06:24:23 UTC 2013
Modified Files:
src/lib/libarch: Makefile
src/lib/libexecinfo: Makefile
Log Message:
Changes for MKCOMPAT for earm.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libarch/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libexecinfo/Makefile
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.24 src/lib/libarch/Makefile:1.25
--- src/lib/libarch/Makefile:1.24 Thu Jul 28 20:30:07 2011
+++ src/lib/libarch/Makefile Sat Apr 27 06:24:22 2013
@@ -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}
Index: src/lib/libexecinfo/Makefile
diff -u src/lib/libexecinfo/Makefile:1.2 src/lib/libexecinfo/Makefile:1.3
--- src/lib/libexecinfo/Makefile:1.2 Thu Apr 25 14:48:09 2013
+++ src/lib/libexecinfo/Makefile Sat Apr 27 06:24:23 2013
@@ -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
