[src/trunk]: src/lib Detect earm*hf* in a cleaner manner

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

details:   https://anonhg.NetBSD.org/src/rev/9f11f10c63dc
branches:  trunk
changeset: 786354:9f11f10c63dc
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Apr 27 08:43:19 2013 +0000

description:
Detect earm*hf* in a cleaner manner

diffstat:

 lib/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r bb8ca2fb0259 -r 9f11f10c63dc lib/Makefile
--- a/lib/Makefile      Sat Apr 27 08:42:44 2013 +0000
+++ b/lib/Makefile      Sat Apr 27 08:43:19 2013 +0000
@@ -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 @@
                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