Module Name: src
Committed By: matt
Date: Sat Apr 27 08:43:19 UTC 2013
Modified Files:
src/lib: Makefile
Log Message:
Detect earm*hf* in a cleaner manner
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/lib/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/Makefile
diff -u src/lib/Makefile:1.200 src/lib/Makefile:1.201
--- src/lib/Makefile:1.200 Fri Apr 12 16:32:37 2013
+++ src/lib/Makefile Sat Apr 27 08:43:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.200 2013/04/12 16:32:37 skrll Exp $
+# $NetBSD: Makefile,v 1.201 2013/04/27 08:43:19 matt Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -39,9 +39,12 @@ SUBDIR+= libarch \
libtelnet libterminfo \
libusbhid libutil libwrap liby libz
-.if (${MACHINE_ARCH:C/e[bl]$//} == "arm" || ${MACHINE_ARCH:C/e[bl]$//} == "earm")
+.if (${MACHINE_CPU} == "arm")
+LIBC_MACHINE_ARCH?=${MACHINE_ARCH}
+.if empty(LIBC_MACHINE_ARCH:M*hf*)
SUBDIR+= libc_vfp
.endif
+.endif
.if (${MKRUMP} != "no")
SUBDIR+= librumpclient
.endif
