Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so/arch/arm Make sure CFLAGS is not empty.



details:   https://anonhg.NetBSD.org/src/rev/c20219f0a93b
branches:  trunk
changeset: 784246:c20219f0a93b
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jan 23 02:18:50 2013 +0000

description:
Make sure CFLAGS is not empty.

diffstat:

 libexec/ld.elf_so/arch/arm/Makefile.inc |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 6f85a35f1b65 -r c20219f0a93b libexec/ld.elf_so/arch/arm/Makefile.inc
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc   Wed Jan 23 02:14:14 2013 +0000
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc   Wed Jan 23 02:18:50 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.13 2013/01/22 22:49:09 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.14 2013/01/23 02:18:50 matt Exp $
 
 SRCS+=         rtld_start.S mdreloc.c
 
@@ -6,8 +6,8 @@
 CPPFLAGS+=     -fpic
 
 CPPFLAGS+=     -DELFSIZE=32
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" || \
-  ${CFLAGS:Mabi=aapcs} != ""
+.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" \
+    || (!empty(CFLAGS) && ${CFLAGS:Mabi=aapcs} != "")
 CPPFLAGS+=     -DHAVE_INITFINI_ARRAY
 .endif
 



Home | Main Index | Thread Index | Old Index