[src/matt-nb6-plus]: src Handle CPUFLAGS being empty

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

details:   https://anonhg.NetBSD.org/src/rev/1ecc2890b8e8
branches:  matt-nb6-plus
changeset: 774540:1ecc2890b8e8
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jan 23 02:14:54 2013 +0000

description:
Handle CPUFLAGS being empty

diffstat:

 lib/csu/arch/arm/Makefile.inc           |  4 ++--
 libexec/ld.elf_so/arch/arm/Makefile.inc |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 0ee1ae8ebe9f -r 1ecc2890b8e8 lib/csu/arch/arm/Makefile.inc
--- a/lib/csu/arch/arm/Makefile.inc     Tue Jan 22 22:56:58 2013 +0000
+++ b/lib/csu/arch/arm/Makefile.inc     Wed Jan 23 02:14:54 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.1.10.2 2013/01/22 22:56:35 matt Exp $
+# $NetBSD: Makefile.inc,v 1.1.10.3 2013/01/23 02:14:54 matt Exp $
 
 CPPFLAGS+=     -DELFSIZE=32
 .if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" \
-    || ${CPUFLAGS:M-mabi=aapcs*} != ""
+    || (!empty(CPUFLAGS) && ${CPUFLAGS:M-mabi=aapcs*} != "")
 CPPFLAGS+=      -DHAVE_INITFINI_ARRAY
 .endif
diff -r 0ee1ae8ebe9f -r 1ecc2890b8e8 libexec/ld.elf_so/arch/arm/Makefile.inc
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc   Tue Jan 22 22:56:58 2013 +0000
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc   Wed Jan 23 02:14:54 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11.46.1 2013/01/22 21:47:28 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.11.46.2 2013/01/23 02:15:53 matt Exp $
 
 SRCS+=         rtld_start.S mdreloc.c
 
@@ -6,7 +6,8 @@
 CPPFLAGS+=     -fpic
 
 CPPFLAGS+=     -DELFSIZE=32
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
+.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" \
+    || (!empty(CPUFLAGS) && ${CPUFLAGS:M-mabi=aapcs*} != "")
 CPPFLAGS+=     -DHAVE_INITFINI_ARRAY
 .endif