Module Name: src Committed By: matt Date: Wed Jan 23 02:18:50 UTC 2013
Modified Files: src/libexec/ld.elf_so/arch/arm: Makefile.inc Log Message: Make sure CFLAGS is not empty. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/libexec/ld.elf_so/arch/arm/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/libexec/ld.elf_so/arch/arm/Makefile.inc diff -u src/libexec/ld.elf_so/arch/arm/Makefile.inc:1.13 src/libexec/ld.elf_so/arch/arm/Makefile.inc:1.14 --- src/libexec/ld.elf_so/arch/arm/Makefile.inc:1.13 Tue Jan 22 22:49:09 2013 +++ src/libexec/ld.elf_so/arch/arm/Makefile.inc Wed Jan 23 02:18:50 2013 @@ -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 @@ SRCS+= rtld_start.S mdreloc.c 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