Wed Jan 23 02:31:54 2013 UTC ()
Handle CPUFLAGS being empty


(matt)
diff -r1.14 -r1.15 src/libexec/ld.elf_so/arch/arm/Makefile.inc
cvs diff -r1.14 -r1.15 src/libexec/ld.elf_so/arch/arm/Makefile.inc (expand / switch to unified diff)

--- src/libexec/ld.elf_so/arch/arm/Makefile.inc 2013/01/23 02:18:50 1.14
+++ src/libexec/ld.elf_so/arch/arm/Makefile.inc 2013/01/23 02:31:54 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.14 2013/01/23 02:18:50 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.15 2013/01/23 02:31:54 matt Exp $
2 2
3SRCS+= rtld_start.S mdreloc.c 3SRCS+= rtld_start.S mdreloc.c
4 4
5# XXX Should not be in CPPFLAGS! 5# XXX Should not be in CPPFLAGS!
6CPPFLAGS+= -fpic 6CPPFLAGS+= -fpic
7 7
8CPPFLAGS+= -DELFSIZE=32 8CPPFLAGS+= -DELFSIZE=32
9.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" \ 9.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" \
10 || (!empty(CFLAGS) && ${CFLAGS:Mabi=aapcs} != "") 10 || (!empty(CPUFLAGS) && ${CPUFLAGS:M-mabi=aapcs*} != "")
11CPPFLAGS+= -DHAVE_INITFINI_ARRAY 11CPPFLAGS+= -DHAVE_INITFINI_ARRAY
12.endif 12.endif
13 13
14LDFLAGS+= -Wl,-e,_rtld_start 14LDFLAGS+= -Wl,-e,_rtld_start