Module Name: src
Committed By: mrg
Date: Sun Jul 11 07:43:12 UTC 2010
Modified Files:
src/libexec/ld.elf_so/arch/mips: Makefile.inc
Log Message:
make sure to look in CFLAGS, COPTS and CPPFLAGS for abi options.
fixes sgimips64 build of n64 ld.elf_so.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/libexec/ld.elf_so/arch/mips/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/mips/Makefile.inc
diff -u src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.18 src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.19
--- src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.18 Fri Dec 18 17:10:07 2009
+++ src/libexec/ld.elf_so/arch/mips/Makefile.inc Sun Jul 11 07:43:12 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.18 2009/12/18 17:10:07 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.19 2010/07/11 07:43:12 mrg Exp $
SRCS+= rtld_start.S mips_reloc.c
COPTS+= -G0
-ABI64?= ${CFLAGS:M-mabi=64}
-ABIO64?= ${CFLAGS:M-mabi=o64}
+ABI64?= ${CFLAGS:M-mabi=64} ${CPPFLAGS:M-mabi=64} ${COPTS:M-mabi=64}
+ABIO64?= ${CFLAGS:M-mabi=o64} ${CPPFLAGS:M-mabi=o64} ${COPTS:M-mabi=o64}
.if !empty(ABI64) || !empty(ABIO64)
CPPFLAGS+= -DELFSIZE=64
.else
